[seam-commits] Seam SVN: r12024 - in branches/community/Seam_2_2/examples/booking: view and 1 other directory.
Author: jharting
Date: 2010-02-09 09:46:11 -0500 (Tue, 09 Feb 2010)
New Revision: 12024
Modified:
branches/community/Seam_2_2/examples/booking/resources/WEB-INF/pages.xml
branches/community/Seam_2_2/examples/booking/view/home.xhtml
Log:
JBSEAM-4533 Booking example
Modified: branches/community/Seam_2_2/examples/booking/resources/WEB-INF/pages.xml
===================================================================
--- branches/community/Seam_2_2/examples/booking/resources/WEB-INF/pages.xml 2010-02-09
14:39:52 UTC (rev 12023)
+++ branches/community/Seam_2_2/examples/booking/resources/WEB-INF/pages.xml 2010-02-09
14:46:11 UTC (rev 12024)
@@ -8,8 +8,7 @@
<page view-id="/register.xhtml">
- <action if="#{validation.failed}"
- execute="#{register.invalid}"/>
+ <action if="#{validation.failed}"
execute="#{register.invalid}"/>
<navigation>
<rule if="#{register.registered}">
@@ -21,17 +20,14 @@
<page view-id="/home.xhtml"
action="#{identity.isLoggedIn}">
- <navigation from-action="#{identity.isLoggedIn}">
- <rule if-outcome="true">
- <redirect view-id="/main.xhtml"/>
- </rule>
- </navigation>
-
- <navigation>
- <rule if="#{identity.loggedIn}">
- <redirect view-id="/main.xhtml"/>
- </rule>
- </navigation>
+ <navigation from-action="#{identity.isLoggedIn}">
+ <rule if-outcome="true">
+ <redirect view-id="/main.xhtml"/>
+ </rule>
+ <rule if-outcome="false">
+ <render view-id="/home.xhtml"/>
+ </rule>
+ </navigation>
</page>
Modified: branches/community/Seam_2_2/examples/booking/view/home.xhtml
===================================================================
--- branches/community/Seam_2_2/examples/booking/view/home.xhtml 2010-02-09 14:39:52 UTC
(rev 12023)
+++ branches/community/Seam_2_2/examples/booking/view/home.xhtml 2010-02-09 14:46:11 UTC
(rev 12024)
@@ -29,7 +29,7 @@
<h:inputSecret id="password" value="#{identity.password}"
style="width: 175px;"/>
</div>
<div class="errors"><h:messages id="messages"
globalOnly="true"/></div>
- <div class="buttonBox"><h:commandButton id="login"
action="#{identity.login}" value="Account Login"/></div>
+ <div class="buttonBox"><h:commandButton id="login"
action="#{identity.quietLogin}" value="Account
Login"/></div>
<div class="notes"><s:link id="register"
view="/register.xhtml" value="Register New User"/></div>
<div class="subnotes">
Or use a demo account: