Changeset 885 for branches

Timestamp:

Apr 14, 2011, 10:57:50 PM (14 years ago)

Author:

gav

Message:

Refactor assetTreeCompact to use includes and controller action instead of direct render call in gsp.

Location:

branches/features/grailsUpgrade/grails-app

Files:

• controllers/AssetDetailedController.groovy (modified) (1 diff)
• views/shared/_assetTreeCompact.gsp (modified) (2 diffs)
• views/taskProcedureDetailed/_taskProcedure.gsp (modified) (1 diff)
• views/taskProcedureDetailed/_taskProcedureRevision.gsp (modified) (1 diff)

branches/features/grailsUpgrade/grails-app/controllers/AssetDetailedController.groovy

@@ -42 +42 @@
         def s = assetTreeService.buildAssetTree(params, session)
         render s
+    }
+
+    /**
+    * Build and return the compact asset tree response.
+    */
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_AssetManager', 'ROLE_AssetUser'])
+    def assetTreeCompact = {
+        def assetInstance = Asset.read(params.id)
+        if(!assetInstance) {
+            render g.message(code: 'default.not.found', args: ['Asset',params.id])
+            return
+        }
+
+        render(template:"/shared/assetTreeCompact", model:['assetInstance':assetInstance])
     }
 

branches/features/grailsUpgrade/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-->

branches/features/grailsUpgrade/grails-app/views/taskProcedureDetailed/_taskProcedure.gsp

@@ -27 +27 @@
                 <td valign="top" class="name">Linked Asset:</td>
                 <td valign="top" class="value">
-                    <g:render template="/shared/assetTreeCompact" model="['assetInstance': taskProcedureInstance.linkedTask.primaryAsset]" />
+                    <g:include controller="assetDetailed" action="assetTreeCompact" id="${taskProcedureInstance.linkedTask.primaryAsset.id}" />
                 </td>
             </tr>

branches/features/grailsUpgrade/grails-app/views/taskProcedureDetailed/_taskProcedureRevision.gsp

@@ -25 +25 @@
                         <td valign="top" class="name">Linked Asset:</td>
                         <td valign="top" class="value">
-                            <g:render template="/shared/assetTreeCompact" model="['assetInstance': taskProcedureRevision.linkedTask.primaryAsset]" />
+                            <g:include controller="assetDetailed" action="assetTreeCompact" id="${taskProcedureRevision.linkedTask.primaryAsset.id}" />
+
                         </td>
                     </tr>