[jboss-cvs] jboss-seam/seam-gen/view ...
Gavin King
gavin.king at jboss.com
Sun Dec 10 10:42:03 EST 2006
User: gavin
Date: 06/12/10 10:42:03
Modified: seam-gen/view edit.xhtml.ftl list.xhtml.ftl
view.xhtml.ftl
Added: seam-gen/view edit.page.xml.ftl param.xml.ftl
Log:
make the Done buttons work nicely
Revision Changes Path
1.18 +5 -3 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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- edit.xhtml.ftl 7 Dec 2006 04:15:45 -0000 1.17
+++ edit.xhtml.ftl 10 Dec 2006 15:42:02 -0000 1.18
@@ -220,7 +220,7 @@
id="view${parentName}"
value="View"
propagation="end">
- <f:param name="${parentName}Id"
+ <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
</s:link>
</h:column>
@@ -262,8 +262,9 @@
id="select${childName}"
value="Select"
propagation="end">
- <f:param name="${childName}Id"
+ <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
+ <f:param name="${childName}From" value="${entityName}"/>
</s:link>
</h:column>
</h:dataTable>
@@ -275,8 +276,9 @@
value="Add ${childName}"
view="/${childEditPageName}.xhtml"
propagation="begin">
- <f:param name="${componentName}Id"
+ <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
+ <f:param name="${childName}From" value="${entityName}"/>
</s:button>
</div>
1.7 +2 -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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- list.xhtml.ftl 4 Dec 2006 03:36:03 -0000 1.6
+++ list.xhtml.ftl 10 Dec 2006 15:42:02 -0000 1.7
@@ -48,7 +48,7 @@
<s:link view="/${pageName}.xhtml"
value="Select"
id="${componentName}">
- <f:param name="${componentName}Id"
+ <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
value="${'#'}{${componentName}.${pojo.identifierProperty.name}}"/>
</s:link>
</h:column>
1.7 +28 -24 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- view.xhtml.ftl 4 Dec 2006 03:36:03 -0000 1.6
+++ view.xhtml.ftl 10 Dec 2006 15:42:02 -0000 1.7
@@ -63,20 +63,14 @@
<div class="actionButtons">
- <s:button id="edit" value="Edit"
- view="/${editPageName}.xhtml"
- propagation="begin">
- <f:param name="${componentName}Id"
- value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
- </s:button>
-
- <s:button id="delete" value="Delete"
- action="${'#'}{${homeName}.remove}"
- rendered="${'#'}{${homeName}.managed}"
- view="/${masterPageName}.xhtml">
- <f:param name="${componentName}Id"
- value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
- </s:button>
+ <s:button view="/${editPageName}.xhtml"
+ id="edit"
+ value="Edit"
+ propagation="begin"/>
+
+ <s:button view="/${'#'}{empty ${componentName}From ? '${masterPageName}' : ${componentName}From}.xhtml"
+ id="done"
+ value="Done"/>
</div>
<#foreach property in pojo.allPropertiesIterator>
@@ -114,8 +108,11 @@
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link id="view${parentName}" value="View" view="/${parentPageName}.xhtml">
- <f:param name="${parentName}Id" value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
+ <s:link id="view${parentName}"
+ value="View"
+ view="/${parentPageName}.xhtml">
+ <f:param name="${parentName}${util.upper(parentPojo.identifierProperty.name)}"
+ value="${'#'}{${parentName}.${parentPojo.identifierProperty.name}}"/>
</s:link>
</h:column>
</h:dataTable>
@@ -151,8 +148,12 @@
</#foreach>
<h:column>
<f:facet name="header">action</f:facet>
- <s:link id="select${childName}" value="Select" view="/${childPageName}.xhtml">
- <f:param name="${childName}Id" value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
+ <s:link id="select${childName}"
+ value="Select"
+ view="/${childPageName}.xhtml">
+ <f:param name="${childName}${util.upper(childPojo.identifierProperty.name)}"
+ value="${'#'}{${childName}.${childPojo.identifierProperty.name}}"/>
+ <f:param name="${childName}From" value="${entityName}"/>
</s:link>
</h:column>
</h:dataTable>
@@ -160,10 +161,13 @@
</div>
<div class="actionButtons">
- <s:button id="add${childName}" value="Add ${childName}"
- view="/${childEditPageName}.xhtml" propagation="begin">
- <f:param name="${componentName}Id"
+ <s:button id="add${childName}"
+ value="Add ${childName}"
+ view="/${childEditPageName}.xhtml"
+ propagation="begin">
+ <f:param name="${componentName}${util.upper(pojo.identifierProperty.name)}"
value="${'#'}{${homeName}.instance.${pojo.identifierProperty.name}}"/>
+ <f:param name="${childName}From" value="${entityName}"/>
</s:button>
</div>
</#if>
1.1 date: 2006/12/10 15:42:02; author: gavin; state: Exp;jboss-seam/seam-gen/view/edit.page.xml.ftl
Index: edit.page.xml.ftl
===================================================================
<!DOCTYPE page PUBLIC
"-//JBoss/Seam Pages Configuration DTD 1.1//EN"
"http://jboss.com/products/seam/pages-1.1.dtd">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
<#assign homeName = componentName + "Home">
<#assign idName = componentName + util.upper(pojo.identifierProperty.name)>
<page>
<param name="${componentName}From"/>
<param name="${idName}"
value="${'#'}{${homeName}.${idName}}"/>
<#include "param.xml.ftl">
</page>
1.1 date: 2006/12/10 15:42:02; author: gavin; state: Exp;jboss-seam/seam-gen/view/param.xml.ftl
Index: param.xml.ftl
===================================================================
<#foreach property in pojo.allPropertiesIterator>
<#if c2h.isManyToOne(property)>
<#assign parentPojo = c2j.getPOJOClass(cfg.getClassMapping(property.value.referencedEntityName))>
<#assign componentName = util.lower(parentPojo.shortName)>
<#assign homeName = componentName + "Home">
<#assign idName = componentName + util.upper(parentPojo.identifierProperty.name)>
<param name="${componentName}From"/>
<param name="${idName}"
value="${'#'}{${homeName}.${idName}}"/>
<#assign p = pojo>
<#assign pojo = parentPojo>
<#include "param.xml.ftl">
<#assign pojo = p>
</#if>
</#foreach>
More information about the jboss-cvs-commits
mailing list