[seam-commits] Seam SVN: r12028 - in branches/community/Seam_2_2/examples/nestedbooking: view and 1 other directory.

Author: jharting Date: 2010-02-09 10:46:47 -0500 (Tue, 09 Feb 2010) New Revision: 12028 Modified: branches/community/Seam_2_2/examples/nestedbooking/resources/WEB-INF/pages.xml branches/community/Seam_2_2/examples/nestedbooking/view/home.xhtml Log: JBSEAM-4533 Nestedbooking example Modified: branches/community/Seam_2_2/examples/nestedbooking/resources/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_2/examples/nestedbooking/resources/WEB-INF/pages.xml 2010-02-09 15:44:14 UTC (rev 12027) +++ branches/community/Seam_2_2/examples/nestedbooking/resources/WEB-INF/pages.xml 2010-02-09 15:46:47 UTC (rev 12028) @@ -4,8 +4,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}"> @@ -17,17 +16,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/nestedbooking/view/home.xhtml =================================================================== --- branches/community/Seam_2_2/examples/nestedbooking/view/home.xhtml 2010-02-09 15:44:14 UTC (rev 12027) +++ branches/community/Seam_2_2/examples/nestedbooking/view/home.xhtml 2010-02-09 15:46:47 UTC (rev 12028) @@ -29,7 +29,7 @@ <h:inputSecret id="password" value="#{identity.password}" style="width: 175px;"/> </div> <div class="errors"><h: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: