Changeset 913 for trunk/grails-app/views/shared/_assetTreeCompact.gsp

Timestamp:

May 1, 2011, 12:46:31 PM (14 years ago)

Author:

gav

Message:

Svn merge -r875:r911 branches/features/grailsUpgrade/ into trunk/.

Location:

trunk

Files:

• . (modified) (1 prop)
• grails-app/views/shared/_assetTreeCompact.gsp (modified) (2 diffs)

trunk/grails-app/views/shared/_assetTreeCompact.gsp

@@ -1 @@
-
-<%--  Fetch to prevent lazy initialization error.  --%>
-<% assetInstance = Asset.read(assetInstance?.id)%>
-
 <div class="static_tree">
-    ${assetInstance?.encodeAsHTML()}
+    ${assetInstance.encodeAsHTML()}
     <div class="static_tree_compact">
         <ul>
-        <g:each var="assetSubItem1" in="${assetInstance?.assetSubItems?.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
+        <g:each var="assetSubItem1" in="${assetInstance.assetSubItems?.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
             <li>
-                ${assetSubItem1?.encodeAsHTML()}
+                ${assetSubItem1.encodeAsHTML()}
             </li>
 
@@ -17 +13 @@
                 <g:each var="assetSubItem2" in="${assetSubItem1.subItems.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }">
                     <li>
-                        ${assetSubItem2?.encodeAsHTML()}
+                        ${assetSubItem2.encodeAsHTML()}
                     </li>
                 </g:each> <!--assetSubItem2-->