Changeset 284

Timestamp:

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

Author:

gav

Message:

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

Location:

trunk/grails-app

Files:

• controllers/AssetDetailedController.groovy (modified) (2 diffs)
• i18n/messages.properties (modified) (1 diff)
• services/AssetService.groovy (modified) (1 diff)
• taglib/AssetTreeTagLib.groovy (modified) (4 diffs)
• views/assetDetailed/overview.gsp (modified) (1 diff)
• views/assetDetailed/search.gsp (modified) (1 diff)
• views/shared/_assetTree.gsp (modified) (1 diff)

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])

trunk/grails-app/i18n/messages.properties

@@ -9 +9 @@
 asset.copy.method.help=Link creates a new asset and links it to EXISTING sub items. \
     While copy creates a new asset and new sub items.
+asset.copy.asset.required=Please select an asset to copy.
 
 sub.task.create.confirm=Immediately create and save a new sub task?

trunk/grails-app/services/AssetService.groovy

@@ -2 +2 @@
 
     boolean transactional = false
+
+    def create(params) {
+        def result = [:]
+        def fail = { Map m ->
+            result.error = [ code: m.code, args: ["Asset", params.id] ]
+            return result
+        }
+
+        result.assetInstance = new Asset()
+        result.assetInstance.properties = params
+
+        // success
+        return result
+    }
+
+    def copy(params) {
+        def result = [:]
+        def fail = { Map m ->
+            result.error = [ code: m.code, args: ["Asset", params.id] ]
+            return result
+        }
+
+        result.assetToCopy = Asset.get(params.assetToCopy?.id)
+
+        if(!result.assetToCopy)
+            return fail(code: "asset.copy.asset.required")
+
+        result.assetInstance = new Asset(name: result.assetToCopy.name,
+                                                            description: result.assetToCopy.description,
+                                                            section: result.assetToCopy.section)
+
+        result.assetInstance.properties = params
+
+        // success
+        return result
+    }
+
+    def save(params) {
+        def result = [:]
+        def fail = { Map m ->
+            if(result.assetInstance && m.field) 
+                result.assetInstance.errors.rejectValue(m.field, m.code)
+            result.error = [ code: m.code, args: ["Asset", params.id] ]
+            return result
+        }
+
+        result.assetInstance = new Asset(params)
+
+        if(result.assetInstance.hasErrors() || !result.assetInstance.save(flush: true))
+            return fail(code:"default.create.failure")
+
+        // success
+        return result
+    }
 
     def saveCopy(params) {

trunk/grails-app/taglib/AssetTreeTagLib.groovy

@@ -81 +81 @@
                                                             img(src: addImg(), alt: 'Add', title: 'Add Sub Item')
                                                         }
+                                                        a(href: assetCopyLink(asset.id)) {
+                                                            img(src: copyImg(), alt: 'Add', title: 'Copy Asset')
+                                                        }
                                                     } // li
 
@@ -240 +243 @@
     }
 
-    def sectionCreateLink(id) {
-        createLink(controller: 'sectionDetailed', action: 'create', params: ['id': id] ).toString()
+    def sectionCreateLink(siteId) {
+        createLink(controller: 'sectionDetailed', action: 'create', params: ['site.id': siteId] ).toString()
     }
 
@@ -252 +255 @@
     }
 
-    def assetCreateLink(id) {
-        createLink(controller: 'assetDetailed', action: 'create', params: ['id': id] ).toString()
+    def assetCreateLink(sectionId) {
+        createLink(controller: 'assetDetailed', action: 'create', params: ['section.id': sectionId] ).toString()
     }
 
@@ -265 +268 @@
 
     def assetCopyLink(id) {
-        createLink(controller: 'assetDetailed', action: 'copy', params: ['asset.id': id] ).toString()
+        createLink(controller: 'assetDetailed', action: 'copy', params: ['assetToCopy.id': id] ).toString()
     }
 

trunk/grails-app/views/assetDetailed/overview.gsp

@@ -14 +14 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
 
             <div class="dialog">

trunk/grails-app/views/assetDetailed/search.gsp

@@ -15 +15 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
+
             <filterpane:currentCriteria domainBean="Asset"
                                     action="search"

trunk/grails-app/views/shared/_assetTree.gsp

@@ -5 +5 @@
         <img src="${resource(dir:'images/skin',file:'database_add.png')}" alt="Add" title="Add Sub Item"/>
     </g:link>
-    <g:link params="['asset.id':assetInstance?.id]" action="copy">
+    <g:link params="['assetToCopy.id':assetInstance?.id]" action="copy">
         <img src="${resource(dir:'images/skin',file:'page_copy.png')}" alt="Copy" title="Copy Asset"/>
     </g:link>