Changeset 421 for trunk/grails-app/services

Timestamp:

Mar 2, 2010, 9:12:24 AM (15 years ago)

Author:

gav

Message:

Add a logFileLink to the import error messages.
Small adjustment to asset import redirect.

File:

• trunk/grails-app/services/AssetCsvService.groovy (modified) (8 diffs)

trunk/grails-app/services/AssetCsvService.groovy

@@ -10 +10 @@
 
     boolean transactional = false
+
+    def g = new org.codehaus.groovy.grails.plugins.web.taglib.ApplicationTagLib()
 
     /**
@@ -22 +24 @@
             def kByteMultiplier = 1000
             def fileMaxSize = 500 * kByteMultiplier
+            def logFileLink = g.link(controller: "appCore", action: "appLog") {"log"}
 
             def multiPartFile = request.getFile('file')
@@ -155 +158 @@
                     if(!siteInstance.save()) {
                         log.error "Failed to create site on line: " + column.name + "(" + lineNumber + ")"
-                        return fail(code: "asset.tree.import.failure", args: [lineNumber])
+                        return fail(code: "asset.tree.import.failure", args: [lineNumber, logFileLink])
                     }
                 }
@@ -174 +177 @@
                     if(!departmentInstance.save()) {
                         log.error "Failed to create department on line: " + column.name + "(" + lineNumber + ")"
-                        return fail(code: "asset.tree.import.failure", args: [lineNumber])
+                        return fail(code: "asset.tree.import.failure", args: [lineNumber, logFileLink])
                     }
                 }
@@ -194 +197 @@
                     if(!sectionInstance.save()) {
                         log.error "Failed to create section on line: " + column.name + "(" + lineNumber + ")"
-                        return fail(code: "asset.tree.import.failure", args: [lineNumber])
+                        return fail(code: "asset.tree.import.failure", args: [lineNumber, logFileLink])
                     }
                 }
@@ -213 +216 @@
                     if(!assetInstance.save()) {
                         log.error "Failed to create asset on line: " + column.name + "(" + lineNumber + ")"
-                        return fail(code: "asset.tree.import.failure", args: [lineNumber])
+                        return fail(code: "asset.tree.import.failure", args: [lineNumber, logFileLink])
                     }
                 }
@@ -231 +234 @@
                     if(!assetInstance.save()) {
                         log.error "Failed to create assetSubItem on line: " + column.name + "(" + lineNumber + ")"
-                        return fail(code: "asset.tree.import.failure", args: [lineNumber])
+                        return fail(code: "asset.tree.import.failure", args: [lineNumber, logFileLink])
                     }
                 }
@@ -250 +253 @@
                         if(!assetSubItemInstance.save()) {
                             log.error "Failed to create assetSubItem on line: " + column.name + "(" + lineNumber + ")"
-                            return fail(code: "asset.tree.import.failure", args: [lineNumber])
+                            return fail(code: "asset.tree.import.failure", args: [lineNumber, logFileLink])
                         }
                     }