Changeset 421 for trunk/grails-app

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.

Location:

trunk/grails-app

Files:

• controllers/AssetDetailedController.groovy (modified) (1 diff)
• i18n/messages.properties (modified) (1 diff)
• services/AssetCsvService.groovy (modified) (8 diffs)

trunk/grails-app/controllers/AssetDetailedController.groovy

@@ -63 +63 @@
         def result = assetCsvService.importAssetTree(request)
 
-        if(!result.error)
+        if(!result.error) {
             flash.message = g.message(code: "asset.tree.import.success")
-        else
-            flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
-
+            redirect(action:search)
+            return
+        }
+
+        flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
         redirect(action: importAssetTree)
     }

trunk/grails-app/i18n/messages.properties

@@ -3 +3 @@
 
 asset.tree.import.success=Asset tree imported.
-asset.tree.import.failure=Could not create asset tree from supplied file, failed on line {0}.
+asset.tree.import.failure=Could not create asset tree from supplied file, failed on line {0}, see {1}.
 
 inventory.import.success=Inventory imported.
-inventory.import.failure=Could not create inventory from supplied file, failed on line {0}.
+inventory.import.failure=Could not create inventory from supplied file, failed on line {0}, see {1}.
 
 asset.copy.method.required=Please select a copy method for sub items.

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