Changeset 749 for trunk/grails-app/controllers

Timestamp:

Jan 21, 2011, 3:19:01 PM (14 years ago)

Author:

gav

Message:

New task type 'Parent PM', display these tasks as 'Life Plan' in asset views.

File:

• trunk/grails-app/controllers/AssetDetailedController.groovy (modified) (4 diffs)

trunk/grails-app/controllers/AssetDetailedController.groovy

@@ -11 +11 @@
     def assetService
     def assetTreeService
+    def taskService
 
     // the delete, save and update actions only accept POST requests
@@ -235 +236 @@
             flash.message = "Asset not found with id ${params.id}"
             redirect(action:search)
-        }
-        else { return [ assetInstance : assetInstance ] }
+            return
+        }
+
+        return [ assetInstance : assetInstance,
+                        parentPMs: taskService.getParentPMs(assetInstance)]
     }
 
@@ -275 +279 @@
             flash.message = "Asset not found with id ${params.id}"
             redirect(action:search)
-        }
-        else {
-            return [ assetInstance : assetInstance, possibleAssetSubItems: assetService.possibleAssetSubItems() ]
-        }
+            return
+        }
+
+        return [ assetInstance : assetInstance,
+                        possibleAssetSubItems: assetService.possibleAssetSubItems(),
+                        parentPMs: taskService.getParentPMs(assetInstance) ]
+
     }
 
@@ -286 +293 @@
     def update = {
         def assetInstance = Asset.get( params.id )
-        if(assetInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(assetInstance.version > version) {
-
-                    assetInstance.errors.rejectValue("version", "default.optimistic.locking.failure")
-                    render(view:'edit',model:[assetInstance:assetInstance, possibleAssetSubItems: assetService.possibleAssetSubItems()])
-                    return
-                }
+
+        if(!assetInstance) {
+            flash.message = "Asset not found with id ${params.id}"
+            redirect(action:search)
+            return
+        }
+
+        if(params.version) {
+            def version = params.version.toLong()
+            if(assetInstance.version > version) {
+
+                assetInstance.errors.rejectValue("version", "default.optimistic.locking.failure")
+                render(view:'edit',model:[assetInstance:assetInstance,
+                                                            possibleAssetSubItems: assetService.possibleAssetSubItems(),
+                                                            parentPMs: taskService.getParentPMs(assetInstance)] )
+                return
             }
-
-            assetInstance.properties = params
-
-            use(WordUtils) {
-                assetInstance.name = assetInstance.name.capitalize()
-                assetInstance.description = assetInstance.description.capitalize()
-            }
-
-            assetInstance.setAssetSubItemsFromCheckBoxList(params.assetSubItems)
-
-            if(!assetInstance.hasErrors() && assetInstance.save(flush: true)) {
-                flash.message = "Asset '${assetInstance.name}' updated"
-                redirect(action:show,id:assetInstance.id)
-            }
-            else {
-                render(view:'edit',model:[assetInstance:assetInstance, possibleAssetSubItems: assetService.possibleAssetSubItems()])
-            }
+        }
+
+        assetInstance.properties = params
+
+        use(WordUtils) {
+            assetInstance.name = assetInstance.name.capitalize()
+            assetInstance.description = assetInstance.description.capitalize()
+        }
+
+        assetInstance.setAssetSubItemsFromCheckBoxList(params.assetSubItems)
+
+        if(!assetInstance.hasErrors() && assetInstance.save(flush: true)) {
+            flash.message = "Asset '${assetInstance.name}' updated"
+            redirect(action:show,id:assetInstance.id)
         }
         else {
-            flash.message = "Asset not found with id ${params.id}"
-            redirect(action:search)
-        }
+            render(view:'edit',model:[assetInstance:assetInstance,
+                                                        possibleAssetSubItems: assetService.possibleAssetSubItems(),
+                                                        parentPMs: taskService.getParentPMs(assetInstance)] )
+        }
+
     }