Changeset 360 for trunk/grails-app/services/AssetService.groovy

Timestamp:

Feb 16, 2010, 10:02:34 AM (15 years ago)

Author:

gav

Message:

Configure cascade deletion of Site -> Section -> Asset -> SubItems.

File:

• trunk/grails-app/services/AssetService.groovy (modified) (2 diffs)

trunk/grails-app/services/AssetService.groovy

@@ -47 +47 @@
                     r = assetSubItemService.delete(id: assetSubItem.id)
                     if(r.error) {
+                        log.debug r.error
                         fail(code:"asset.subItems.delete.failure")
                         break
@@ -56 +57 @@
                 return result
 
-            try {
-                result.assetInstance.delete(flush:true)
-                return result //Success.
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                return fail(code:"default.delete.failure")
-            }
+            // Success.
+            // We have handled all the foreign keys so the delete should go forward.
+            // Can't flush here due to cascading from Section and Site.
+            // And without flush there is no point it trying to catch the dao.DataIntegrityViolationException
+            // since that will only happen after leaving the transaction.
+            result.assetInstance.delete()
+            return result
 
         } // end withTransaction