Changeset 658 for trunk

Timestamp:

Sep 24, 2010, 3:46:02 AM (14 years ago)

Author:

gav

Message:

Show AssetSubItem after update, since returning to an Asset makes no sense.

File:

• trunk/grails-app/controllers/AssetSubItemDetailedController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/AssetSubItemDetailedController.groovy

@@ -177 +177 @@
             if(!assetSubItemInstance.hasErrors() && assetSubItemInstance.save(flush: true)) {
                 flash.message = "Sub Item '${assetSubItemInstance.name}' updated"
-
-                if(assetSubItemInstance.assets)
-                    redirect(controller: "assetDetailed", action:"show", id: assetSubItemInstance.assets.toArray()[0].id)
-                else {
-                    //Get the top parentItem.
-                    def parentItem = assetSubItemInstance.parentItem
-                    def i = 0
-                    while(parentItem?.parentItem) {
-                        parentItem = parentItem.parentItem
-                        // Protect against infinite recurrsion.
-                        i++
-                        if(i > 100)
-                            break
-                    }
-
-                    if(parentItem?.assets)
-                        redirect(controller: "assetDetailed", action:"show", id: parentItem.assets.toArray()[0].id)
-                    else
-                        redirect(action:"show", id: assetSubItemInstance.id) // End stop if all else fails.
-                }
+                redirect(action:"show", id: assetSubItemInstance.id)
             }
             else {
@@ -206 +187 @@
             redirect(action: "search")
         }
-    }
+    } // update
 
     def create = {