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

[seam-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2008-10-14 19:05:11 -0400 (Tue, 14 Oct 2008)
New Revision: 9322

Modified:
   trunk/seam-gen/icefaces/view/list.xhtml.ftl
   trunk/seam-gen/view/list.xhtml.ftl
Log:
include query alias in sort path (to be compliant with JPA)


Modified: trunk/seam-gen/icefaces/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/list.xhtml.ftl	2008-10-14 22:56:40 UTC (rev 9321)
+++ trunk/seam-gen/icefaces/view/list.xhtml.ftl	2008-10-14 23:05:11 UTC (rev 9322)
@@ -92,7 +92,7 @@
                 <ui:include src="layout/sort.xhtml">
                     <ui:param name="entityList" value="${'#'}{${listName}}"/>
                     <ui:param name="propertyLabel" value="${label(componentProperty.name)}"/>
-                    <ui:param name="propertyPath" value="${propertyPath}"/>
+                    <ui:param name="propertyPath" value="${componentName}.${propertyPath}"/>
                 </ui:include>
             </f:facet>
             ${'#'}{${componentName}.${property.name}.${componentProperty.name}}
@@ -104,7 +104,7 @@
                 <ui:include src="layout/sort.xhtml">
                     <ui:param name="entityList" value="${'#'}{${listName}}"/>
                     <ui:param name="propertyLabel" value="${label(property.name)}"/>
-                    <ui:param name="propertyPath" value="${property.name}"/>
+                    <ui:param name="propertyPath" value="${componentName}.${property.name}"/>
                 </ui:include>
             </f:facet>
             ${'#'}{${componentName}.${property.name}}&amp;nbsp;
@@ -121,7 +121,7 @@
                 <ui:include src="layout/sort.xhtml">
                     <ui:param name="entityList" value="${'#'}{${listName}}"/>
                     <ui:param name="propertyLabel" value="${label(property.name)} ${label(componentProperty.name)?uncap_first}"/>
-                    <ui:param name="propertyPath" value="${propertyPath}"/>
+                    <ui:param name="propertyPath" value="${componentName}.${propertyPath}"/>
                 </ui:include>
             </f:facet>
             ${'#'}{${componentName}.${propertyPath}}&amp;nbsp;
@@ -134,7 +134,7 @@
                 <ui:include src="layout/sort.xhtml">
                     <ui:param name="entityList" value="${'#'}{${listName}}"/>
                     <ui:param name="propertyLabel" value="${label(property.name)} ${label(parentPojo.identifierProperty.name)?uncap_first}"/>
-                    <ui:param name="propertyPath" value="${propertyPath}"/>
+                    <ui:param name="propertyPath" value="${componentName}.${propertyPath}"/>
                 </ui:include>
             </f:facet>
             ${'#'}{${componentName}.${propertyPath}}

Modified: trunk/seam-gen/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/list.xhtml.ftl	2008-10-14 22:56:40 UTC (rev 9321)
+++ trunk/seam-gen/view/list.xhtml.ftl	2008-10-14 23:05:11 UTC (rev 9322)
@@ -74,7 +74,7 @@
                 <ui:include src="layout/sort.xhtml">
                     <ui:param name="entityList" value="${'#'}{${listName}}"/>
                     <ui:param name="propertyLabel" value="${label(componentProperty.name)}"/>
-                    <ui:param name="propertyPath" value="${propertyPath}"/>
+                    <ui:param name="propertyPath" value="${componentName}.${propertyPath}"/>
                 </ui:include>
             </f:facet>
             <@outputValue property=componentProperty expression="${'#'}{_${componentName}.${property.name}.${componentProperty.name}}" indent=12/>
@@ -86,7 +86,7 @@
                 <ui:include src="layout/sort.xhtml">
                     <ui:param name="entityList" value="${'#'}{${listName}}"/>
                     <ui:param name="propertyLabel" value="${label(property.name)}"/>
-                    <ui:param name="propertyPath" value="${property.name}"/>
+                    <ui:param name="propertyPath" value="${componentName}.${property.name}"/>
                 </ui:include>
             </f:facet>
             <@outputValue property=property expression="${'#'}{_${componentName}.${property.name}}" indent=12/>
@@ -103,7 +103,7 @@
                 <ui:include src="layout/sort.xhtml">
                     <ui:param name="entityList" value="${'#'}{${listName}}"/>
                     <ui:param name="propertyLabel" value="${label(property.name)} ${label(componentProperty.name)?uncap_first}"/>
-                    <ui:param name="propertyPath" value="${propertyPath}"/>
+                    <ui:param name="propertyPath" value="${componentName}.${propertyPath}"/>
                 </ui:include>
             </f:facet>
             <@outputValue property=componentProperty expression="${'#'}{_${componentName}.${propertyPath}}" indent=12/>
@@ -116,7 +116,7 @@
                 <ui:include src="layout/sort.xhtml">
                     <ui:param name="entityList" value="${'#'}{${listName}}"/>
                     <ui:param name="propertyLabel" value="${label(property.name)} ${label(parentPojo.identifierProperty.name)?uncap_first}"/>
-                    <ui:param name="propertyPath" value="${propertyPath}"/>
+                    <ui:param name="propertyPath" value="${componentName}.${propertyPath}"/>
                 </ui:include>
             </f:facet>
             <@outputValue property=parentPojo.identifierProperty expression="${'#'}{_${componentName}.${propertyPath}}" indent=12/>