[jboss-cvs] JBossAS SVN: r101246 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-subscriptions-web/src/main/webapp and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: lvlcek at redhat.com
Date: 2010-02-22 08:34:18 -0500 (Mon, 22 Feb 2010)
New Revision: 101246

Modified:
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
Log:
fixing JBQA-3098 for searchFields using rich:hotKey

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml	2010-02-22 13:22:03 UTC (rev 101245)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/createReservation.xhtml	2010-02-22 13:34:18 UTC (rev 101246)
@@ -16,8 +16,11 @@
                         <f:facet name="header">Filter accounts</f:facet>
                         <h:form>
                             Type subscriber name:
-                            <h:inputText value="#{accountFilter.subscriberNameFragment}" label="Search name"/>
-                            <a4j:commandButton value="Search" action="#{accountFilter.searchAccounts}"
+                            <h:inputText id="searchField" value="#{accountFilter.subscriberNameFragment}"
+                                         label="Search name"/>
+                            <rich:hotKey selector="##{rich:clientId('searchField')}" key="return"
+                                         handler="#{rich:element('searchButton')}.onclick();return false;"/>
+                            <a4j:commandButton id="searchButton" value="Search" action="#{accountFilter.searchAccounts}"
                                                reRender="accountsTable"/>
                         </h:form>
                     </rich:panel>
@@ -132,12 +135,12 @@
 
                     <h:outputLabel value="Equipment"/>
                     <h:outputText rendered="#{reservationCreate.reservation.equipment != null}"
-                            value="#{reservationCreate.reservation.equipment.name} (#{reservationCreate.reservation.equipment.description})"/>
+                                  value="#{reservationCreate.reservation.equipment.name} (#{reservationCreate.reservation.equipment.description})"/>
                     <h:outputText rendered="#{reservationCreate.reservation.equipment == null}" value="Not selected"/>
 
                     <h:outputLabel value="Account"/>
                     <h:outputText rendered="#{reservationCreate.reservation.account != null}"
-                            value="#{reservationCreate.reservation.account.subscriber.name.firstName} #{reservationCreate.reservation.account.subscriber.name.lastName} (#{reservationCreate.reservation.account.subscriber.address.city}, #{reservationCreate.reservation.account.subscriber.address.country})"/>
+                                  value="#{reservationCreate.reservation.account.subscriber.name.firstName} #{reservationCreate.reservation.account.subscriber.name.lastName} (#{reservationCreate.reservation.account.subscriber.address.city}, #{reservationCreate.reservation.account.subscriber.address.country})"/>
                     <h:outputText rendered="#{reservationCreate.reservation.account == null}" value="Not selected"/>
 
                     <h:outputLabel value="From"/>

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml	2010-02-22 13:22:03 UTC (rev 101245)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-web/src/main/webapp/searchForm.xhtml	2010-02-22 13:34:18 UTC (rev 101246)
@@ -11,8 +11,10 @@
         <rich:panel>
             <f:facet name="header">Search for an account</f:facet>
             <h:form>
-                <h:inputText value="#{accountSearch.name}" label="Search name"/>
-                <a4j:commandButton value="Search" action="#{accountSearch.searchAccounts}"
+                <h:inputText id="searchField" value="#{accountSearch.name}" label="Search name"/>
+                <rich:hotKey selector="##{rich:clientId('searchField')}" key="return"
+                             handler="#{rich:element('searchButton')}.onclick();return false;"/>
+                <a4j:commandButton id="searchButton" value="Search" action="#{accountSearch.searchAccounts}"
                                    reRender="searchResults"/>
             </h:form>
         </rich:panel>