Author: jjamrich Date: 2011-09-08 09:58:56 -0400 (Thu, 08 Sep 2011) New Revision: 22693 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/Capital.java modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml Log: RFPL-1612: Fix problem in pickList with submit value Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/Capital.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/Capital.java 2011-09-07 21:34:20 UTC (rev 22692) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/Capital.java 2011-09-08 13:58:56 UTC (rev 22693) @@ -81,4 +81,8 @@ public void setTimeZone(String timeZone) { this.timeZone = timeZone; } + + public String toString() { + return name + " (" + state + ")"; + } } Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml 2011-09-07 21:34:20 UTC (rev 22692) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPickList/columnLayout.xhtml 2011-09-08 13:58:56 UTC (rev 22693) @@ -58,7 +58,8 @@ maxListHeight="#{richPickListBean.attributes['maxListHeight'].value}" minListHeight="#{richPickListBean.attributes['minListHeight'].value}" onadditems="#{richPickListBean.attributes['onadditems'].value}" - onblur="#{richPickListBean.attributes['onblur'].value}" onchange="#{richPickListBean.attributes['onchange'].value}" + onblur="#{richPickListBean.attributes['onblur'].value}" + onchange="#{richPickListBean.attributes['onchange'].value}" onclick="#{richPickListBean.attributes['onclick'].value}" ondblclick="#{richPickListBean.attributes['ondblclick'].value}" onfocus="#{richPickListBean.attributes['onfocus'].value}" @@ -118,32 +119,17 @@ validator="#{richPickListBean.validatePickListValue}" value="#{richPickListBean.value}" valueChangeListener="#{richBean.valueChangeListenerImproved}"> - - <f:selectItems value="#{richPickListBean.capitals}" /> - <f:facet name="header"> - <h:outputText value="Header Facet" /> - </f:facet> - - <f:facet name="caption"> - <h:outputText id="captionFacet" value="Caption Facet" /> - </f:facet> - - <f:facet name="label"> - <h:outputText id="labelFacet" value="Label Facet" /> - </f:facet> + <f:selectItems value="#{richPickListBean.capitals}" /> <h:column id="columnFlag"> - <h:graphicImage name="#{tmp.stateFlag}" /> + <h:graphicImage name="#{tmp.stateFlag}" /> </h:column> <h:column id="columnCapital"> <f:facet name="header"> <h:outputText id="columnHeaderCapital" value="Capital Header" /> </f:facet> - <f:facet name="label"> - <h:outputText id="columnLabelCapital" value="Label Facet" /> - </f:facet> <h:outputText value="#{tmp.name}" /> </h:column> @@ -151,9 +137,6 @@ <f:facet name="header"> <h:outputText id="columnHeaderState" value="State Header" /> </f:facet> - <f:facet name="label"> - <h:outputText id="columnLabelState" value="Label Facet" /> - </f:facet> <h:outputText value="#{tmp.state}" /> </h:column>