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

[Gavin King]

  User: gavin   
  Date: 06/11/07 04:11:57

  Modified:    seam-gen/view   edit.xhtml.ftl list.xhtml.ftl
  Log:
  separate view/edit pages, better conversation model
  
  Revision  Changes    Path
  1.4       +14 -6     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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- edit.xhtml.ftl	7 Nov 2006 06:57:44 -0000	1.3
  +++ edit.xhtml.ftl	7 Nov 2006 09:11:57 -0000	1.4
  @@ -4,6 +4,7 @@
   <#assign componentName = util.lower(entityName)>
   <#assign homeName = componentName + "Home">
   <#assign masterPageName = entityName + "List">
  +<#assign pageName = entityName>
   
   <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:s="http://jboss.com/products/seam/taglib"
  @@ -77,12 +78,10 @@
                   propagation="end" linkStyle="button"
                   view="/${masterPageName}.xhtml"/>
               <s:link id="done" value="Done" linkStyle="button"
  -                propagation="end" view="/${masterPageName}.xhtml"/>			  
  +                propagation="end" view="/${pageName}.xhtml"/>			  
           </div>
       </h:form>
       
  -    <!-- work in progress -->
  -    
   <#foreach property in pojo.allPropertiesIterator>
   
   <#if c2h.isManyToOne(property)>
  @@ -106,14 +105,14 @@
   <#if c2h.isManyToOne(parentProperty)>
   <#assign parentParentPojo = c2j.getPOJOClass(cfg.getClassMapping(parentProperty.value.referencedEntityName))>
                  <h:column>
  -		           <f:facet name="header">${parentProperty.name}} ${parentParentPojo.identifierProperty.name}</f:facet>
  +		           <f:facet name="header">${parentProperty.name} ${parentParentPojo.identifierProperty.name}</f:facet>
   			       ${'#'}{${parentName}.${parentProperty.name}.${parentPojo.identifierProperty.name}}
   			   </h:column>
   </#if>
   </#foreach>
                  <h:column>
                      <f:facet name="header">action</f:facet>
  -		           <s:link id="${parentName}" value="View" view="/${parentPageName}.xhtml" propagation="nest">
  +		           <s:link id="${parentName}" value="View" view="/${parentPageName}.xhtml" propagation="end">
   		               <f:param name="${parentName}Id" value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
   		           </s:link>
                  </h:column>
  @@ -124,6 +123,7 @@
             <h2>${property.name}</h2>
   <#assign childPojo = c2j.getPOJOClass(property.value.element.associatedClass)>
   <#assign childPageName = childPojo.shortName>
  +<#assign childEditPageName = childPojo.shortName + "Edit">
   <#assign childName = util.lower(childPojo.shortName)>
             <h:outputText value="No ${property.name}" rendered="${'#'}{empty ${homeName}.${property.name}}"/>
             <h:dataTable value="${'#'}{${homeName}.${property.name}}" 
  @@ -141,11 +141,19 @@
   </#foreach>
               <h:column>
                   <f:facet name="header">action</f:facet>
  -		        <s:link id="${childName}" value="Select" view="/${childPageName}.xhtml" propagation="nest">
  +		        <s:link id="${childName}" value="Select" view="/${childPageName}.xhtml" propagation="end">
   		            <f:param name="${childName}Id" value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
   		        </s:link>
               </h:column>
             </h:dataTable>
  +          
  +		    <div class="actionButtons">
  +		        <s:link id="add" value="Add ${childName}" linkStyle="button"
  +		            view="/${childEditPageName}.xhtml" propagation="begin">
  +	            	<f:param name="${componentName}Id" 
  +	            	    value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
  +	            </s:link>
  +		    </div>
   </#if>
   </#foreach>
       
  
  
  
  1.3       +4 -3      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- list.xhtml.ftl	7 Nov 2006 06:57:44 -0000	1.2
  +++ list.xhtml.ftl	7 Nov 2006 09:11:57 -0000	1.3
  @@ -4,6 +4,7 @@
   <#assign componentName = util.lower(entityName)>
   <#assign listName = componentName + "List">
   <#assign pageName = entityName>
  +<#assign editPageName = entityName + "Edit">
   
   <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:s="http://jboss.com/products/seam/taglib"
  @@ -41,15 +42,15 @@
   </#foreach>
           <h:column>
               <f:facet name="header">action</f:facet>
  -            <s:link id="${componentName}" value="Select" view="/${pageName}.xhtml" propagation="begin">
  +            <s:link id="${componentName}" value="Select" view="/${pageName}.xhtml">
                   <f:param name="${componentName}Id" value="${'#'}{${componentName}.${pojo.identifierProperty.name}}"/>
               </s:link>
           </h:column>
       </h:dataTable>
       
       <div class="actionButtons">
  -        <s:link id="done" value="Create ${componentName}" linkStyle="button"
  -            view="/${pageName}.xhtml"/>			  
  +        <s:link id="create" value="Create ${componentName}" linkStyle="button"
  +            view="/${editPageName}.xhtml" propagation="begin"/>			  
       </div>
       
   </ui:define>