Changeset 290

Timestamp:

Jan 22, 2010, 5:29:24 PM (14 years ago)

Author:

gav

Message:

Secure and work on import asset tree functions.
Improvements to CustomTagLib.

Location:

trunk/grails-app

Files:

• controllers/AssetDetailedController.groovy (modified) (1 diff)
• i18n/messages.properties (modified) (2 diffs)
• services/AssetSubItemService.groovy (modified) (1 diff)
• services/CreateDataService.groovy (modified) (1 diff)
• services/CsvService.groovy (modified) (1 diff)
• taglib/CustomTagLib.groovy (modified) (3 diffs)
• views/assetDetailed/edit.gsp (modified) (1 diff)

trunk/grails-app/controllers/AssetDetailedController.groovy

@@ -14 +14 @@
     static allowedMethods = [delete:'POST', save:'POST', update:'POST', saveCopy:'POST']
 
+    def overview = {
+    }
+
+    @Secured(['ROLE_Manager','ROLE_AppAdmin'])
     def importAssetTree = {
     }
-    def overview = {
-    }
-
+
+    @Secured(['ROLE_Manager','ROLE_AppAdmin'])
     def importAssetTreeSave = {
         def result = csvService.importAssetTree(request)

trunk/grails-app/i18n/messages.properties

@@ -1 +1 @@
 asset.tree.import.success=Asset tree imported.
-asset.tree.import.failure=Could not create asset tree from supplied file.
+asset.tree.import.failure=Could not create asset tree from supplied file, failed on line {0}.
 asset.tree.import.file.over.max.size=Supplied file is greater than max size of {0} Mbytes.
 asset.tree.import.file.not.supplied=No file supplied.
@@ -22 +22 @@
 person.personGroups.help=Groups may be assigned to tasks and \
 may also provide a record of persons qualified or trained in a specific area. \
-Use Ctrl or Shift to select multiple groups. \
-Groups provide no application authorisations.
+    Groups provide no application authorisations.
 person.loginName=Login Name
 person.loginName.help=This is the id or name that the person will use to login to the application.

trunk/grails-app/services/AssetSubItemService.groovy

@@ -22 +22 @@
 
     def save(params) {
-        Asset.withTransaction { status ->
+        AssetSubItem.withTransaction { status ->
             def result = [:]
 

trunk/grails-app/services/CreateDataService.groovy

@@ -156 +156 @@
         saveAndTest(authInstance)
 
+        // #3
         authInstance = new Authority(description:"Application User, all application users need this base role to allow login.",
                                         authority:"ROLE_AppUser")

trunk/grails-app/services/CsvService.groovy

@@ -16 +16 @@
     */
     def importAssetTree(request) {
-        def result = [:]
-
-        def megaByteMultiplier = 1000 * 1000
-        def fileMaxSize = 10 * megaByteMultiplier //Mb
-
-        def multiPartFile = request.getFile('file')
-
-        InputStreamReader sr = new InputStreamReader(multiPartFile.inputStream)
-        CSVReader reader = new CSVReader(sr)
-
-        def fail = { Map m ->
-            //status.setRollbackOnly()
-            reader.close()
-            result.error = [ code: m.code, args: m.args ]
-            return result
-        }
-
-        if(!multiPartFile || multiPartFile.isEmpty())
-            return fail(code: "asset.tree.import.file.not.supplied")
-
-        if (multiPartFile.getSize() > fileMaxSize)
-            return fail(code: "asset.tree.import.file.over.max.size", args: [fileMaxSize/megaByteMultiplier])
-
-        def line = reader.readNext()
-        def lineNumber = 1
-
-        def header = ["Site", "Section", "Asset", "Sub Asset", "Functional Assembly", "Sub Assembly Group"]
-
-        if(line != header)
-            return fail(code: "asset.tree.import.no.header")
-
-        log.info "Import checks passed, start processing asset file."
-
-        // Prepare the first body line.
-        line = reader.readNext()
-        lineNumber ++
-
-        while(line) {
-            def lineSize = line.size()
-//             log.info lineNumber+ "(" + lineSize + ")" + " : " + line
-
-            if(line[0]) {
-                    if( !Site.findByName(line[0]) )
-                        new Site(name: line[0]).save()
-            }
-
+        Asset.withTransaction { status ->
+            def result = [:]
+
+            def megaByteMultiplier = 1000 * 1000
+            def fileMaxSize = 10 * megaByteMultiplier //Mb
+
+            def multiPartFile = request.getFile('file')
+
+            InputStreamReader sr = new InputStreamReader(multiPartFile.inputStream)
+            CSVReader reader = new CSVReader(sr)
+
+            def fail = { Map m ->
+                status.setRollbackOnly()
+                reader.close()
+                result.error = [ code: m.code, args: m.args ]
+                return result
+            }
+
+            if(!multiPartFile || multiPartFile.isEmpty())
+                return fail(code: "asset.tree.import.file.not.supplied")
+
+            if (multiPartFile.getSize() > fileMaxSize)
+                return fail(code: "asset.tree.import.file.over.max.size", args: [fileMaxSize/megaByteMultiplier])
+
+            def line = reader.readNext()
+            def lineNumber = 1
+
+            def header = ["Site", "Section", "Asset", "Sub Asset", "Functional Assembly", "Sub Assembly Group"]
+
+            if(line != header)
+                return fail(code: "asset.tree.import.no.header")
+
+            log.info "Import checks passed, start processing asset file."
+
+            // Prepare the first body line.
             line = reader.readNext()
             lineNumber ++
-        } //while(line)
-
-        // Success.
-        reader.close()
-        return result
-
+
+            def siteInstance
+            def sectionInstance
+            def assetInstance
+
+            while(line) {
+                def lineSize = line.size()
+    //             log.info lineNumber+ "(" + lineSize + ")" + " : " + line
+
+                if(line[0]) {
+                        if( !Site.findByName(line[0]) )
+                            siteInstance = new Site(name: line[0])
+                            if(!siteInstance.save())
+                                return fail(code: "asset.tree.import.failure", args: [lineNumber])
+                }
+                else continue
+
+                if(line[1]) {
+                        if( !Section.findByName(line[1]) )
+                           sectionInstance =  new Section(name: line[1],
+                                                                                site: siteInstance)
+                            if(!sectionInstance.save())
+                                return fail(code: "asset.tree.import.failure", args: [lineNumber])
+                }
+                else continue
+
+                if(line[2]) {
+                        if( !Asset.findByName(line[2]) )
+                            assetInstance = new Asset(name: line[2],
+                                                                        section: sectionInstance)
+                            if(!sectionInstance.save())
+                                return fail(code: "asset.tree.import.failure", args: [lineNumber])
+                }
+                else continue
+
+                line = reader.readNext()
+                lineNumber ++
+            } //while(line)
+
+            // Success.
+            reader.close()
+            return result
+
+        } //end withTransaction
     } // end importAssetTree()
 

trunk/grails-app/taglib/CustomTagLib.groovy

@@ -36 +36 @@
         def isChecked, ht, wd, style, html
 
+        def displayFields = attrs.displayFields
+
+        def displayValue = " "
+
         // sets the style to override height and/or width if either of them
         // is specified, else the default from the CSS is taken
@@ -54 +58 @@
         from.each { obj ->
 
+            displayValue = " "
+
+            if( displayFields?.contains("id") ) {
+                displayValue += obj.id + " - "
+            }
+
+            if(displayFields?.contains("name")) {
+                displayValue += obj.name
+            }
+            else displayValue += obj
+
             // if we wanted to select the checkbox using a click anywhere on the label (also hover effect)
             // but grails does not recognize index suffix in the name as an array:
@@ -61 +76 @@
             isChecked = (value?.contains(obj."${attrs.optionKey}"))? true: false
 
-            out << "<li>" << checkBox(name:cname, value:obj."${attrs.optionKey}", checked: isChecked) << " ${obj.id} - ${obj.name}" << "</li>"
+            out << "<li>" << checkBox(name:cname, value:obj."${attrs.optionKey}", checked: isChecked) << displayValue << "</li>"
         }
 

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

@@ -88 +88 @@
                                                                     from="${AssetSubItem.list()}"
                                                                     value="${assetInstance?.assetSubItems.collect{it.id}}"
-                                                                    optionKey="id"/>
+                                                                    optionKey="id"
+                                                                    displayFields="['id', 'name']"/>
 
                                 </td>