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

[Gavin King]

  User: gavin   
  Date: 07/02/07 17:10:40

  Modified:    seam-gen/view    edit.page.xml.ftl edit.xhtml.ftl
                        list.xhtml.ftl
  Log:
  fix conversation model
  
  Revision  Changes    Path
  1.6       +4 -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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- edit.page.xml.ftl	7 Feb 2007 17:14:21 -0000	1.5
  +++ edit.page.xml.ftl	7 Feb 2007 22:10:40 -0000	1.6
  @@ -19,10 +19,14 @@
      <navigation from-action="${'#'}{${homeName}.persist}">
          <redirect view-id="/${pageName}.xhtml"/>
      </navigation>
  +   
      <navigation from-action="${'#'}{${homeName}.update}">
  +       <end-conversation/>
          <redirect view-id="/${pageName}.xhtml"/>
      </navigation>
  +   
      <navigation from-action="${'#'}{${homeName}.remove}">
  +       <end-conversation/>
          <redirect view-id="/${masterPageName}.xhtml"/>
      </navigation>
      
  
  
  
  1.24      +5 -8      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.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- edit.xhtml.ftl	7 Feb 2007 15:40:19 -0000	1.23
  +++ edit.xhtml.ftl	7 Feb 2007 22:10:40 -0000	1.24
  @@ -160,12 +160,10 @@
                            action="${'#'}{${homeName}.update}"
                          rendered="${'#'}{${homeName}.managed}"/>
                           			  
  -            <s:button id="delete" 
  +            <h:commandButton id="delete" 
                      value="Delete" 
                     action="${'#'}{${homeName}.remove}"
  -                rendered="${'#'}{${homeName}.managed}"
  -             propagation="end"
  -                    view="/${masterPageName}.xhtml"/>
  +                       rendered="${'#'}{${homeName}.managed}"/>
                       
               <s:button id="done" 
                      value="Done"
  @@ -175,7 +173,6 @@
                   
               <s:button id="cancel" 
                      value="Cancel"
  -             propagation="end" 
                       view="/${masterPageName}.xhtml"
                   rendered="${'#'}{!${homeName}.managed}"/>
                   
  
  
  
  1.12      +1 -2      jboss-seam/seam-gen/view/list.xhtml.ftl
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: list.xhtml.ftl
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/seam-gen/view/list.xhtml.ftl,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- list.xhtml.ftl	7 Feb 2007 15:40:19 -0000	1.11
  +++ list.xhtml.ftl	7 Feb 2007 22:10:40 -0000	1.12
  @@ -135,8 +135,7 @@
       <div class="actionButtons">
           <s:button view="/${editPageName}.xhtml"
                       id="create" 
  -                 value="Create ${componentName}"
  -           propagation="begin"/>
  +                 value="Create ${componentName}"/>
       </div>
       
   </ui:define>