Changeset 684

Timestamp:

Oct 6, 2010, 12:48:17 AM (14 years ago)

Author:

gav

Message:

Change flow of asset and assetSubItem extendedAttribute controllers to return to show views after edit/update or delete.

Location:

trunk/grails-app/controllers

Files:

• AssetExtendedAttributeDetailedController.groovy (modified) (2 diffs)
• AssetSubItemExtendedAttributeDetailedController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/AssetExtendedAttributeDetailedController.groovy

@@ -22 +22 @@
         def assetExtendedAttributeInstance = AssetExtendedAttribute.get( params.id )
         if(assetExtendedAttributeInstance) {
+            def asset = assetExtendedAttributeInstance.asset
             try {
                 assetExtendedAttributeInstance.delete(flush:true)
                 flash.message = "AssetExtendedAttribute ${params.id} deleted"
-                redirect(controller: "assetDetailed", action: "search")
+                redirect(controller: "assetDetailed", action: 'show', id: asset.id)
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
@@ -65 +66 @@
             if(!assetExtendedAttributeInstance.hasErrors() && assetExtendedAttributeInstance.save(flush: true)) {
                 flash.message = "AssetExtendedAttribute ${params.id} updated"
-                redirect(action:show,id:assetExtendedAttributeInstance.id)
+                //redirect(action:show,id:assetExtendedAttributeInstance.id)
+                redirect(controller: 'assetDetailed', action: 'show', id: assetExtendedAttributeInstance.asset.id)
             }
             else {

trunk/grails-app/controllers/AssetSubItemExtendedAttributeDetailedController.groovy

@@ -22 +22 @@
         def assetSubItemExtendedAttributeInstance = AssetSubItemExtendedAttribute.get( params.id )
         if(assetSubItemExtendedAttributeInstance) {
+            def assetSubItem = assetSubItemExtendedAttributeInstance.assetSubItem
             try {
                 assetSubItemExtendedAttributeInstance.delete(flush:true)
                 flash.message = "AssetSubItemExtendedAttribute ${params.id} deleted"
-                redirect(controller: "assetDetailed", action: "search")
+                redirect(controller: "assetSubItemDetailed", action: 'show', id: assetSubItem.id)
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
@@ -65 +66 @@
             if(!assetSubItemExtendedAttributeInstance.hasErrors() && assetSubItemExtendedAttributeInstance.save(flush: true)) {
                 flash.message = "AssetSubItemExtendedAttribute ${params.id} updated"
-                redirect(action:show,id:assetSubItemExtendedAttributeInstance.id)
+                //redirect(action:show,id:assetSubItemExtendedAttributeInstance.id)
+                redirect(controller: 'assetSubItemDetailed', action: 'show', id: assetSubItemExtendedAttributeInstance.assetSubItem.id)
             }
             else {