From richfaces-svn-commits at lists.jboss.org Thu Nov 24 18:53:52 2011
Content-Type: multipart/mixed; boundary="===============4497910750734773890=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r23004 - in
 modules/tests/metamer/trunk/application/src/main:
 webapp/components/richCollapsibleSubTable and 1 other directory.
Date: Thu, 24 Nov 2011 18:53:52 -0500
Message-ID: <201111242353.pAONrqeY031279@svn01.web.mwc.hst.phx2.redhat.com>

--===============4497910750734773890==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jjamrich
Date: 2011-11-24 18:53:52 -0500 (Thu, 24 Nov 2011)
New Revision: 23004

Added:
   modules/tests/metamer/trunk/application/src/main/webapp/components/richC=
ollapsibleSubTable/rf-11656.xhtml
Modified:
   modules/tests/metamer/trunk/application/src/main/java/org/richfaces/test=
s/metamer/bean/rich/RichCollapsibleSubTableBean.java
   modules/tests/metamer/trunk/application/src/main/webapp/components/richC=
ollapsibleSubTable/list.xhtml
Log:
RF-11656: add example to simulate issue

Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfac=
es/tests/metamer/bean/rich/RichCollapsibleSubTableBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/bean/rich/RichCollapsibleSubTableBean.java	2011-11-24 17:56:59 U=
TC (rev 23003)
+++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tes=
ts/metamer/bean/rich/RichCollapsibleSubTableBean.java	2011-11-24 23:53:52 U=
TC (rev 23004)
@@ -79,6 +79,9 @@
     private Map<String, Object> filtering =3D new HashMap<String, Object>(=
);
     // expanded
     private Map<List<Employee>, Boolean> expanded =3D new HashMap<List<Emp=
loyee>, Boolean>();
+    =

+    // expanded state for employee detail (for RF-11656) =

+    private Map<Employee, Boolean> expandedEmployee =3D new HashMap<Employ=
ee, Boolean>();
 =

     /**
      * Initializes the managed bean.
@@ -181,4 +184,12 @@
     public Map<List<Employee>, Boolean> getExpanded() {
         return expanded;
     }
+    =

+    public Map<Employee, Boolean> getExpandedEmployee() {
+        return expandedEmployee;
+    }
+
+    public void setExpandedEmployee(Map<Employee, Boolean> expandedEmploye=
e) {
+        this.expandedEmployee =3D expandedEmployee;
+    }
 }

Modified: modules/tests/metamer/trunk/application/src/main/webapp/component=
s/richCollapsibleSubTable/list.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/components/rich=
CollapsibleSubTable/list.xhtml	2011-11-24 17:56:59 UTC (rev 23003)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/rich=
CollapsibleSubTable/list.xhtml	2011-11-24 23:53:52 UTC (rev 23004)
@@ -64,6 +64,10 @@
             <metamer:testPageLink id=3D"keepSaved" outcome=3D"keepSaved" v=
alue=3D"Keep Saved">
                 Page for testing attribute keepSaved of <b>rich:collapsibl=
eSubTable</b>.
             </metamer:testPageLink>
+            =

+            <metamer:testPageLink id=3D"rf-11656" outcome=3D"rf-11656" val=
ue=3D"RF-11656">
+                Page for testing <a href=3D"https://issues.jboss.org/brows=
e/RF-11656" target=3D"_blank" >RF-11656</a>
+            </metamer:testPageLink>
 =

         </ui:define>
 =


Added: modules/tests/metamer/trunk/application/src/main/webapp/components/r=
ichCollapsibleSubTable/rf-11656.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/components/rich=
CollapsibleSubTable/rf-11656.xhtml	                        (rev 0)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/rich=
CollapsibleSubTable/rf-11656.xhtml	2011-11-24 23:53:52 UTC (rev 23004)
@@ -0,0 +1,132 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns=3D"http://www.w3.org/1999/xhtml"
+      xmlns:h=3D"http://java.sun.com/jsf/html"
+      xmlns:a4j=3D"http://richfaces.org/a4j"
+      xmlns:rich=3D"http://richfaces.org/rich"
+      xmlns:f=3D"http://java.sun.com/jsf/core"
+      xmlns:ui=3D"http://java.sun.com/jsf/facelets"
+      xmlns:c=3D"http://java.sun.com/jsp/jstl/core"
+      xmlns:metamer=3D"http://java.sun.com/jsf/composite/metamer">
+
+    <!--
+JBoss, Home of Professional Open Source
+Copyright 2010-2011, Red Hat, Inc. and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+This is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+This software is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this software; if not, write to the Free
+Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+02110-1301 USA, or see the FSF site: http://www.fsf.org.
+    -->
+
+    <ui:composition template=3D"/templates/template.xhtml">
+
+        <ui:define name=3D"view">
+            <f:metadata>
+                <f:viewParam name=3D"templates" value=3D"#{templateBean.te=
mplates}">
+                    <f:converter converterId=3D"templatesListConverter" />
+                </f:viewParam>
+            </f:metadata>
+        </ui:define>
+
+        <ui:define name=3D"component">
+        =

+            <p>
+                Page with nested collapsibleSubTable to verify <a href=3D"=
https://issues.jboss.org/browse/RF-11656" target=3D"_blank">RF-11656</a>
+                <br/><br/>
+                Nested collapsibleSubTable contains information about empl=
oyee's company (Company Name and Phone).
+                <br/>
+                collapsibleSubTableToggler managing @expanded on nested Co=
llapsibleSubTable is labeled "Employess's Company Details".
+                If you are not able to collapse Company details for employ=
ee, it is still not working<br/>
+                This attribute value (@expanded) for nested collapsibleSub=
Table should be set to false as well, and don't work.
+            </p>
+        =

+            <rich:dataTable id=3D"richDataTable" value=3D"#{richSubTableBe=
an.lists}" var=3D"list" keepSaved=3D"true">
+                <f:facet name=3D"header">
+                    <rich:columnGroup id=3D"columnGroup">
+                        <rich:column id=3D"columnHeaderEmployees" colspan=
=3D"3">
+                            <h:outputText id=3D"columnHeaderEmployeesText"=
 value=3D"Employees" />
+                        </rich:column>
+                        <rich:column id=3D"columnHeaderName" breakRowBefor=
e=3D"true">
+                            <h:outputText id=3D"columnHeaderNameText" valu=
e=3D"Name" />
+                        </rich:column>
+                        <rich:column id=3D"columnHeaderTitle">
+                            <h:outputText id=3D"columnHeaderTitleText" val=
ue=3D"Title" />
+                        </rich:column>
+                        <rich:column id=3D"columnHeaderBirthdate">
+                            <h:outputText id=3D"columnHeaderBirthdateText"=
 value=3D"Birthdate" />
+                        </rich:column>
+                    </rich:columnGroup>
+                </f:facet>
+
+                <rich:column id=3D"columnSubTable1" colspan=3D"3">
+                    <rich:collapsibleSubTableToggler id=3D"subTableTC" for=
=3D"richSubTable1"/>
+                    <h:outputText value=3D"#{list[0].sex =3D=3D 'MALE' ? '=
Men' : 'Women'}" />
+                </rich:column>
+        =

+        =

+                <rich:collapsibleSubTable id=3D"richSubTable1"
+                                          value=3D"#{richSubTableBean.stat=
e ? list : null}"
+                                          var=3D"employee"
+                                          rows=3D"3"
+                                          expandMode=3D"ajax" =

+                                          expanded=3D"#{richSubTableBean.e=
xpanded[list]}">
+                     =

+                     <rich:column>                          =

+                         <h:outputText style=3D"margin-left: 15px" value=
=3D"#{employee.name}"/>
+                     </rich:column>
+                     <rich:column>
+                         <h:outputText value=3D"#{employee.title}"/>
+                     </rich:column>
+                     <rich:column id=3D"columnBirthdate">
+                        <h:outputText id=3D"birthdate" value=3D"#{employee=
.birthdate}">
+                            <f:convertDateTime pattern=3D"d MMM yyyy"/>
+                        </h:outputText>
+                    </rich:column>
+                    =

+                    <rich:collapsibleSubTable value=3D"#{employee.companie=
s}"
+                                              var=3D"company" =

+                                              id=3D"richSubTable2"
+                                              rows=3D"2"
+                                              expandMode=3D"ajax"
+                                              expanded=3D"#{richSubTableBe=
an.expandedEmployee[employee]}">
+                         <!-- Following       ^^^^^^^^ attribute doesn't i=
nfluence component as expected -->
+                         <rich:column>
+                             <f:facet name=3D"header">
+                                <rich:collapsibleSubTableToggler id=3D"sub=
TableTC2" for=3D"richSubTable2"/>
+                            <h:outputText value=3D"Employee's Company Deta=
ils" />
+                             </f:facet>                             =

+                         </rich:column>
+                         =

+                         <rich:column>
+                             <f:facet name=3D"header">
+                                <h:outputText value=3D"Company Name"/>
+                             </f:facet>
+                             <h:outputText style=3D"margin-left: 30px" val=
ue=3D"#{company.name}"/>
+                         </rich:column>                         =

+                         <rich:column>
+                            <f:facet name=3D"header">
+                                <h:outputText value=3D"Company Phone"/>
+                            </f:facet>
+                            <h:outputText value=3D"#{company.phone}"/>
+                         </rich:column>
+                    </rich:collapsibleSubTable>
+               </rich:collapsibleSubTable>
+        =

+            </rich:dataTable>              =

+        </ui:define>
+
+    </ui:composition>
+</html>
\ No newline at end of file


--===============4497910750734773890==--