[seam-commits] Seam SVN: r9331 - in trunk/seam-gen: view and 1 other directory.

Author: dan.j.allen Date: 2008-10-15 00:49:44 -0400 (Wed, 15 Oct 2008) New Revision: 9331 Modified: trunk/seam-gen/icefaces/view/edit.page.xml.ftl trunk/seam-gen/view/edit.page.xml.ftl Log: only follow navigation if method returns non-null value Modified: trunk/seam-gen/icefaces/view/edit.page.xml.ftl =================================================================== --- trunk/seam-gen/icefaces/view/edit.page.xml.ftl 2008-10-15 02:39:39 UTC (rev 9330) +++ trunk/seam-gen/icefaces/view/edit.page.xml.ftl 2008-10-15 04:49:44 UTC (rev 9331) @@ -37,18 +37,24 @@ </#if> <navigation from-action="${'#'}{${homeName}.persist}"> - <end-conversation/> - <redirect view-id="/${pageName}.xhtml"/> + <rule> + <end-conversation/> + <redirect view-id="/${pageName}.xhtml"/> + </rule> </navigation> <navigation from-action="${'#'}{${homeName}.update}"> - <end-conversation/> - <redirect view-id="/${pageName}.xhtml"/> + <rule> + <end-conversation/> + <redirect view-id="/${pageName}.xhtml"/> + </rule> </navigation> <navigation from-action="${'#'}{${homeName}.remove}"> - <end-conversation/> - <redirect view-id="/${masterPageName}.xhtml"/> + <rule> + <end-conversation/> + <redirect view-id="/${masterPageName}.xhtml"/> + </rule> </navigation> </page> Modified: trunk/seam-gen/view/edit.page.xml.ftl =================================================================== --- trunk/seam-gen/view/edit.page.xml.ftl 2008-10-15 02:39:39 UTC (rev 9330) +++ trunk/seam-gen/view/edit.page.xml.ftl 2008-10-15 04:49:44 UTC (rev 9331) @@ -30,18 +30,24 @@ </#if> <navigation from-action="${'#'}{${homeName}.persist}"> - <end-conversation/> - <redirect view-id="/${pageName}.xhtml"/> + <rule> + <end-conversation/> + <redirect view-id="/${pageName}.xhtml"/> + </rule> </navigation> <navigation from-action="${'#'}{${homeName}.update}"> - <end-conversation/> - <redirect view-id="/${pageName}.xhtml"/> + <rule> + <end-conversation/> + <redirect view-id="/${pageName}.xhtml"/> + </rule> </navigation> <navigation from-action="${'#'}{${homeName}.remove}"> - <end-conversation/> - <redirect view-id="/${masterPageName}.xhtml"/> + <rule> + <end-conversation/> + <redirect view-id="/${masterPageName}.xhtml"/> + </rule> </navigation> </page>