[jboss-cvs] JBossAS SVN: r101484 - projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 25 10:47:38 EST 2010
Author: lvlcek at redhat.com
Date: 2010-02-25 10:47:37 -0500 (Thu, 25 Feb 2010)
New Revision: 101484
Modified:
projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml
Log:
WIP JBQA-3032
Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml 2010-02-25 15:45:51 UTC (rev 101483)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-reservations-web/src/main/webapp/searchReservation.xhtml 2010-02-25 15:47:37 UTC (rev 101484)
@@ -115,10 +115,19 @@
<h:panelGrid columns="2">
<h:outputLabel value="Equipment"/>
- <h:outputText value="#{reservationSearch.currentReservation.equipment}" converter="#{equipmentConverter}"/>
+ <h:panelGroup>
+ <h:outputText rendered="#{reservationSearch.currentReservation.equipment != null}"
+ value="#{reservationSearch.currentReservation.equipment.name} (#{reservationSearch.currentReservation.equipment.description})"/>
+ <h:outputText rendered="#{reservationSearch.currentReservation.equipment == null}"
+ value="Not selected"/>
+ </h:panelGroup>
<h:outputLabel value="Account"/>
- <h:outputText value="#{reservationSearch.currentReservation.account}" converter="#{accountConverter}"/>
+ <h:panelGroup>
+ <h:outputText rendered="#{reservationSearch.currentReservation.account != null}"
+ value="#{reservationSearch.currentReservation.account.subscriber.name.firstName} #{reservationSearch.currentReservation.account.subscriber.name.lastName} (#{reservationSearch.currentReservation.account.subscriber.address.city}, #{reservationSearch.currentReservation.account.subscriber.address.country})"/>
+ <h:outputText rendered="#{reservationSearch.currentReservation.account == null}" value="Not selected"/>
+ </h:panelGroup>
<h:outputLabel value="From"/>
<h:outputText value="#{reservationSearch.currentReservation.from}"/>
More information about the jboss-cvs-commits
mailing list