Changeset 352 for trunk/grails-app/services

Timestamp:

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

Author:

gav

Message:

Added some checks to prevent recurrsion loops in Asset tree.

Location:

trunk/grails-app/services

Files:

• AssetService.groovy (modified) (1 diff)
• AssetSubItemService.groovy (modified) (1 diff)

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) {