Changeset 787 for branches/features/taskProcedureRework/grails-app

Timestamp:

Feb 5, 2011, 9:25:06 PM (14 years ago)

Author:

gav

Message:

Add some null checking to AssetService.getAssemblies and assetTreeCompact template.

Location:

branches/features/taskProcedureRework/grails-app

Files:

• services/AssetService.groovy (modified) (1 diff)
• views/shared/_assetTreeCompact.gsp (modified) (1 diff)

branches/features/taskProcedureRework/grails-app/services/AssetService.groovy

@@ -30 +30 @@
     * @returns A list of the assemblies.
     */
-    def getAssemblies(Asset asset) {
+    def getAssemblies(asset) {
         def assemblies = []
+        if(!(asset instanceof Asset))
+            return assemblies
         // Database efficiency:
         // The asset is configured to batch fetch assetSubItems which

branches/features/taskProcedureRework/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()}
     <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()}