[Equanda-svn-commit] SF.net SVN: equanda: [207] trunk/equanda-generate/src/main/velocity/t5gui/ components

[<tri...@us...>]

Revision: 207
          http://equanda.svn.sourceforge.net/equanda/?rev=207&view=rev
Author:   triathlon98
Date:     2007-12-18 07:16:26 -0800 (Tue, 18 Dec 2007)

Log Message:
-----------
EQ-99 fix Display component when no object

Modified Paths:
--------------
    trunk/equanda-generate/src/main/velocity/t5gui/components/Display.java.vm
    trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm

Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Display.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Display.java.vm	2007-12-14 14:00:27 UTC (rev 206)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Display.java.vm	2007-12-18 15:16:26 UTC (rev 207)
@@ -35,8 +35,8 @@
 #set( $ejbPackage=${engine.getConfig("ejb-package")} )
 import ${ejbPackage}.client.${table.Name};
 import ${package}.pages.${table.Name}Edit;
+import org.apache.tapestry.annotations.InjectPage;
 import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.InjectPage;
 import org.apache.tapestry.ioc.annotations.Inject;
 import org.apache.tapestry.ComponentResources;
 import org.equanda.persistence.om.UOID;
@@ -71,4 +71,6 @@
     {
         this.object = object;
     }
+
+    public boolean hasObject() { return object != null; }
 }

Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm	2007-12-14 14:00:27 UTC (rev 206)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Display.tml.vm	2007-12-18 15:16:26 UTC (rev 207)
@@ -1,5 +1,5 @@
 <div xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
-
+    <t:if test="hasObject()">
     <t:actionlink t:id="Edit" context="object.uOID">
 #set( $sep = "" )
 #foreach( $field in $table.getFields() )
@@ -13,5 +13,5 @@
 #end
 #end
     </t:actionlink>
-
+    </t:if>
 </div>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.