[jboss-cvs] jboss-seam/seam-gen/view ...

[Gavin King]

  User: gavin   
  Date: 07/02/09 21:04:37

  Modified:    seam-gen/view    edit.page.xml.ftl edit.xhtml.ftl
                        view.xhtml.ftl
  Log:
  use begin-conversation instead of propagation=begin
  
  Revision  Changes    Path
  1.9       +2 -0      jboss-seam/seam-gen/view/edit.page.xml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: edit.page.xml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/edit.page.xml.ftl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- edit.page.xml.ftl	9 Feb 2007 22:49:37 -0000	1.8
  +++ edit.page.xml.ftl	10 Feb 2007 02:04:37 -0000	1.9
  @@ -10,6 +10,8 @@
   <page no-conversation-view-id="/${masterPageName}.xhtml">
      <restrict>${'#'}{identity.loggedIn}</restrict>
      
  +   <begin-conversation if="${'#'}{${homeName}.managed}"/>
  +   
      <param name="${componentName}From"/>
   <#assign idName = componentName + util.upper(pojo.identifierProperty.name)>
   <#if c2j.isComponent(pojo.identifierProperty)>
  
  
  
  1.29      +2 -1      jboss-seam/seam-gen/view/edit.xhtml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: edit.xhtml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/edit.xhtml.ftl,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- edit.xhtml.ftl	9 Feb 2007 23:40:28 -0000	1.28
  +++ edit.xhtml.ftl	10 Feb 2007 02:04:37 -0000	1.29
  @@ -189,7 +189,8 @@
           <div class="actionButtons">
               <s:button id="add${childName}" 
                      value="Add ${childName}"
  -                    view="/${childEditPageName}.xhtml">
  +                    view="/${childEditPageName}.xhtml"
  +                    propagation="none">
                    <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}" 
                            value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
                    <f:param name="${childName}From" value="${entityName}"/>
  
  
  
  1.13      +1 -2      jboss-seam/seam-gen/view/view.xhtml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: view.xhtml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/view.xhtml.ftl,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- view.xhtml.ftl	9 Feb 2007 23:18:25 -0000	1.12
  +++ view.xhtml.ftl	10 Feb 2007 02:04:37 -0000	1.13
  @@ -35,8 +35,7 @@
   
           <s:button view="/${editPageName}.xhtml" 
                       id="edit" 
  -                 value="Edit"     
  -           propagation="begin"/>
  +                 value="Edit"/>
   
           <s:button view="/${'#'}{empty ${componentName}From ? '${masterPageName}' : ${componentName}From}.xhtml"
                       id="done"