Changeset 352

Timestamp:

Feb 12, 2010, 12:14:23 PM (14 years ago)

Author:

gav

Message:

Added some checks to prevent recurrsion loops in Asset tree.

Location:

trunk/grails-app

Files:

• controllers/AssetSubItemDetailedController.groovy (modified) (2 diffs)
• services/AssetService.groovy (modified) (1 diff)
• services/AssetSubItemService.groovy (modified) (1 diff)
• views/assetSubItemDetailed/edit.gsp (modified) (2 diffs)

trunk/grails-app/controllers/AssetSubItemDetailedController.groovy

@@ -116 +116 @@
             flash.message = "AssetSubItem not found with id ${params.id}"
             redirect(action: "search")
-        }
-        else {
-            return [ assetSubItemInstance : assetSubItemInstance ]
-        }
+            return
+        }
+
+        def possibleParentItems = assetSubItemService.possibleParentItems(assetSubItemInstance)
+
+        return [ assetSubItemInstance : assetSubItemInstance, possibleParentItems: possibleParentItems ]
     }
 
@@ -137 +139 @@
             assetSubItemInstance.properties = params
 
-//             if(!assetSubItemInstance.asset && !assetSubItemInstance.parentItem) {
-//                 flash.message = "Either an asset or parentItem is required."
-//                 render(view:'edit',model:[assetSubItemInstance:assetSubItemInstance])
-//                 return
-//             }
-// 
-//             if(assetSubItemInstance.asset && assetSubItemInstance.parentItem) {
-//             flash.message = "Both an asset and parentItem may not be specified at the same time."
-//                 render(view:'edit',model:[parentItem:parentItem])
-//                 return
-//             }
+            if(assetSubItemInstance.assets) {
+                assetSubItemInstance.parentItem = null
+            }
 
             if(!assetSubItemInstance.hasErrors() && assetSubItemInstance.save(flush: true)) {

trunk/grails-app/services/AssetService.groovy

@@ -12 +12 @@
         def criteria = AssetSubItem.createCriteria()
         def possibleAssetSubItems = criteria.list() {
-            isNull("parentItem")
+            and {
+                eq('isActive', true)
+                isNull("parentItem")
+                }
         }
     }

trunk/grails-app/services/AssetSubItemService.groovy

@@ -2 +2 @@
 
     boolean transactional = false
+
+    /**
+    * Determines and returns sorted list of possible parent items.
+    * @param assetSubItemInstance The instance to prepare the list for.
+    * @returns A list of the possible parentItems.
+    */
+    def possibleParentItems(assetSubItemInstance) {
+        def criteria = AssetSubItem.createCriteria()
+        def possibleParentItems = criteria.list() {
+            and {
+                eq('isActive', true)
+                ne('id', assetSubItemInstance.id)
+                assetSubItemInstance.subItems.each() { notEqual('id', it.id) }
+                }
+        }
+        possibleParentItems.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
+    }
 
     def delete(params) {

trunk/grails-app/views/assetSubItemDetailed/edit.gsp

@@ -95 +95 @@
                                 </td>
                             </tr>
-                        
+
+                            
                             <tr class="prop">
                                 <td valign="top" class="name">
@@ -101 +102 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:assetSubItemInstance,field:'parentItem','errors')}">
-                                    <g:select optionKey="id" from="${AssetSubItem.list()}" name="parentItem.id" value="${assetSubItemInstance?.parentItem?.id}" noSelection="['null':'']"></g:select>
+                                    <g:if test="${assetSubItemInstance.assets}">
+                                        Assigned to assets.
+                                    </g:if>
+                                    <g:else>
+                                        <g:select optionKey="id" from="${possibleParentItems}" name="parentItem.id" value="${assetSubItemInstance?.parentItem?.id}" noSelection="['null':'--None--']"></g:select>
+                                    </g:else>
                                 </td>
-                            </tr> 
+                            </tr>
 
                             <tr class="prop">