Changeset 284 for trunk/grails-app/controllers

Timestamp:

Jan 21, 2010, 11:25:46 AM (15 years ago)

Author:

gav

Message:

Move asset copy and create functions into AssetService.
Repair create links in AssetTreeTagLib.

File:

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

trunk/grails-app/controllers/AssetDetailedController.groovy

@@ -234 +234 @@
 
     def create = {
-        def assetInstance = new Asset()
-        assetInstance.properties = params
-        return ['assetInstance':assetInstance]
+        def result = assetService.create(params)
+
+        if(!result.error)
+            return [assetInstance: result.assetInstance]
+
+        flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
+        redirect(action: search)
     }
 
     def copy = {
-        def assetToCopy = Asset.get(params.asset.id)
-
-        if(!assetToCopy) {
-            flash.message = "Please select an asset to copy."
-            redirect(action: list)
-            return
-        }
-
-        def assetInstance = new Asset(name: assetToCopy.name,
-                                                            description: assetToCopy.description,
-                                                            section: assetToCopy.section)
-        assetInstance.properties = params
-        return ['assetInstance':assetInstance, assetToCopy: assetToCopy]
+        def result = assetService.copy(params)
+
+        if(!result.error)
+            return [assetInstance: result.assetInstance, assetToCopy: result.assetToCopy]
+
+        flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
+        redirect(action: search)
     }
 
     def save = {
-        def assetInstance = new Asset(params)
-        if(!assetInstance.hasErrors() && assetInstance.save(flush: true)) {
-            flash.message = "Asset ${assetInstance.id} created"
-            redirect(action:show,id:assetInstance.id)
-        }
-        else {
-            render(view:'create',model:[assetInstance:assetInstance])
-        }
-    }
-
-    def saveCopy = {
-        def result = assetService.saveCopy(params)
+        def result = assetService.save(params)
 
         if(!result.error) {
@@ -275 +262 @@
         }
 
+        render(view:'create', model:[assetInstance: result.assetInstance])
+    }
+
+
+    def saveCopy = {
+        def result = assetService.saveCopy(params)
+
+        if(!result.error) {
+            flash.message = g.message(code: "default.create.success", args: ["Asset", result.assetInstance.id])
+            redirect(action:show, id: result.assetInstance.id)
+            return
+        }
+
         if(result.error.code == "default.not.found") {
             flash.message = g.message(code: result.error.code, args: ["Asset", params.assetToCopy?.id])