Changeset 268 for trunk/grails-app/controllers

Timestamp:

Jan 14, 2010, 10:51:03 PM (15 years ago)

Author:

gav

Message:

Refactor classes for asset tree refinement.
Regenerate views and controllers to suite.

Location:

trunk/grails-app/controllers

Files:

• AssetSubItemController.groovy (modified) (4 diffs)
• AssetSubItemExtendedAttributeController.groovy (added)
• DepartmentExtendedAttributeController.groovy (added)
• ExtendedAttributeTypeController.groovy (modified) (4 diffs)
• SectionController.groovy (modified) (4 diffs)
• SectionDetailedController.groovy (modified) (4 diffs)
• SectionExtendedAttributeController.groovy (added)
• SiteExtendedAttributeController.groovy (added)

trunk/grails-app/controllers/AssetSubItemController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class AssetTypeController extends BaseAppAdminController {
+class AssetSubItemController extends BaseAppAdminController {
     
     def index = { redirect(action:list,params:params) }
@@ -10 +10 @@
     def list = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ assetTypeInstanceList: AssetType.list( params ), assetTypeInstanceTotal: AssetType.count() ]
+        [ assetSubItemInstanceList: AssetSubItem.list( params ), assetSubItemInstanceTotal: AssetSubItem.count() ]
     }
 
     def show = {
-        def assetTypeInstance = AssetType.get( params.id )
+        def assetSubItemInstance = AssetSubItem.get( params.id )
 
-        if(!assetTypeInstance) {
-            flash.message = "AssetType not found with id ${params.id}"
+        if(!assetSubItemInstance) {
+            flash.message = "AssetSubItem not found with id ${params.id}"
             redirect(action:list)
         }
-        else { return [ assetTypeInstance : assetTypeInstance ] }
+        else { return [ assetSubItemInstance : assetSubItemInstance ] }
     }
 
     def delete = {
-        def assetTypeInstance = AssetType.get( params.id )
-        if(assetTypeInstance) {
+        def assetSubItemInstance = AssetSubItem.get( params.id )
+        if(assetSubItemInstance) {
             try {
-                assetTypeInstance.delete(flush:true)
-                flash.message = "AssetType ${params.id} deleted"
+                assetSubItemInstance.delete(flush:true)
+                flash.message = "AssetSubItem ${params.id} deleted"
                 redirect(action:list)
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "AssetType ${params.id} could not be deleted"
+                flash.message = "AssetSubItem ${params.id} could not be deleted"
                 redirect(action:show,id:params.id)
             }
         }
         else {
-            flash.message = "AssetType not found with id ${params.id}"
+            flash.message = "AssetSubItem not found with id ${params.id}"
             redirect(action:list)
         }
@@ -43 +43 @@
 
     def edit = {
-        def assetTypeInstance = AssetType.get( params.id )
+        def assetSubItemInstance = AssetSubItem.get( params.id )
 
-        if(!assetTypeInstance) {
-            flash.message = "AssetType not found with id ${params.id}"
+        if(!assetSubItemInstance) {
+            flash.message = "AssetSubItem not found with id ${params.id}"
             redirect(action:list)
         }
         else {
-            return [ assetTypeInstance : assetTypeInstance ]
+            return [ assetSubItemInstance : assetSubItemInstance ]
         }
     }
 
     def update = {
-        def assetTypeInstance = AssetType.get( params.id )
-        if(assetTypeInstance) {
+        def assetSubItemInstance = AssetSubItem.get( params.id )
+        if(assetSubItemInstance) {
             if(params.version) {
                 def version = params.version.toLong()
-                if(assetTypeInstance.version > version) {
+                if(assetSubItemInstance.version > version) {
                     
-                    assetTypeInstance.errors.rejectValue("version", "assetType.optimistic.locking.failure", "Another user has updated this AssetType while you were editing.")
-                    render(view:'edit',model:[assetTypeInstance:assetTypeInstance])
+                    assetSubItemInstance.errors.rejectValue("version", "assetSubItem.optimistic.locking.failure", "Another user has updated this AssetSubItem while you were editing.")
+                    render(view:'edit',model:[assetSubItemInstance:assetSubItemInstance])
                     return
                 }
             }
-            assetTypeInstance.properties = params
-            if(!assetTypeInstance.hasErrors() && assetTypeInstance.save(flush: true)) {
-                flash.message = "AssetType ${params.id} updated"
-                redirect(action:show,id:assetTypeInstance.id)
+            assetSubItemInstance.properties = params
+            if(!assetSubItemInstance.hasErrors() && assetSubItemInstance.save(flush: true)) {
+                flash.message = "AssetSubItem ${params.id} updated"
+                redirect(action:show,id:assetSubItemInstance.id)
             }
             else {
-                render(view:'edit',model:[assetTypeInstance:assetTypeInstance])
+                render(view:'edit',model:[assetSubItemInstance:assetSubItemInstance])
             }
         }
         else {
-            flash.message = "AssetType not found with id ${params.id}"
+            flash.message = "AssetSubItem not found with id ${params.id}"
             redirect(action:list)
         }
@@ -82 +82 @@
 
     def create = {
-        def assetTypeInstance = new AssetType()
-        assetTypeInstance.properties = params
-        return ['assetTypeInstance':assetTypeInstance]
+        def assetSubItemInstance = new AssetSubItem()
+        assetSubItemInstance.properties = params
+        return ['assetSubItemInstance':assetSubItemInstance]
     }
 
     def save = {
-        def assetTypeInstance = new AssetType(params)
-        if(!assetTypeInstance.hasErrors() && assetTypeInstance.save(flush: true)) {
-            flash.message = "AssetType ${assetTypeInstance.id} created"
-            redirect(action:show,id:assetTypeInstance.id)
+        def assetSubItemInstance = new AssetSubItem(params)
+        if(!assetSubItemInstance.hasErrors() && assetSubItemInstance.save(flush: true)) {
+            flash.message = "AssetSubItem ${assetSubItemInstance.id} created"
+            redirect(action:show,id:assetSubItemInstance.id)
         }
         else {
-            render(view:'create',model:[assetTypeInstance:assetTypeInstance])
+            render(view:'create',model:[assetSubItemInstance:assetSubItemInstance])
         }
     }

trunk/grails-app/controllers/ExtendedAttributeTypeController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class AssetExtendedAttributeTypeController extends BaseAppAdminController {
+class ExtendedAttributeTypeController extends BaseAppAdminController {
     
     def index = { redirect(action:list,params:params) }
@@ -10 +10 @@
     def list = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ assetExtendedAttributeTypeInstanceList: AssetExtendedAttributeType.list( params ), assetExtendedAttributeTypeInstanceTotal: AssetExtendedAttributeType.count() ]
+        [ extendedAttributeTypeInstanceList: ExtendedAttributeType.list( params ), extendedAttributeTypeInstanceTotal: ExtendedAttributeType.count() ]
     }
 
     def show = {
-        def assetExtendedAttributeTypeInstance = AssetExtendedAttributeType.get( params.id )
+        def extendedAttributeTypeInstance = ExtendedAttributeType.get( params.id )
 
-        if(!assetExtendedAttributeTypeInstance) {
-            flash.message = "AssetExtendedAttributeType not found with id ${params.id}"
+        if(!extendedAttributeTypeInstance) {
+            flash.message = "ExtendedAttributeType not found with id ${params.id}"
             redirect(action:list)
         }
-        else { return [ assetExtendedAttributeTypeInstance : assetExtendedAttributeTypeInstance ] }
+        else { return [ extendedAttributeTypeInstance : extendedAttributeTypeInstance ] }
     }
 
     def delete = {
-        def assetExtendedAttributeTypeInstance = AssetExtendedAttributeType.get( params.id )
-        if(assetExtendedAttributeTypeInstance) {
+        def extendedAttributeTypeInstance = ExtendedAttributeType.get( params.id )
+        if(extendedAttributeTypeInstance) {
             try {
-                assetExtendedAttributeTypeInstance.delete(flush:true)
-                flash.message = "AssetExtendedAttributeType ${params.id} deleted"
+                extendedAttributeTypeInstance.delete(flush:true)
+                flash.message = "ExtendedAttributeType ${params.id} deleted"
                 redirect(action:list)
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "AssetExtendedAttributeType ${params.id} could not be deleted"
+                flash.message = "ExtendedAttributeType ${params.id} could not be deleted"
                 redirect(action:show,id:params.id)
             }
         }
         else {
-            flash.message = "AssetExtendedAttributeType not found with id ${params.id}"
+            flash.message = "ExtendedAttributeType not found with id ${params.id}"
             redirect(action:list)
         }
@@ -43 +43 @@
 
     def edit = {
-        def assetExtendedAttributeTypeInstance = AssetExtendedAttributeType.get( params.id )
+        def extendedAttributeTypeInstance = ExtendedAttributeType.get( params.id )
 
-        if(!assetExtendedAttributeTypeInstance) {
-            flash.message = "AssetExtendedAttributeType not found with id ${params.id}"
+        if(!extendedAttributeTypeInstance) {
+            flash.message = "ExtendedAttributeType not found with id ${params.id}"
             redirect(action:list)
         }
         else {
-            return [ assetExtendedAttributeTypeInstance : assetExtendedAttributeTypeInstance ]
+            return [ extendedAttributeTypeInstance : extendedAttributeTypeInstance ]
         }
     }
 
     def update = {
-        def assetExtendedAttributeTypeInstance = AssetExtendedAttributeType.get( params.id )
-        if(assetExtendedAttributeTypeInstance) {
+        def extendedAttributeTypeInstance = ExtendedAttributeType.get( params.id )
+        if(extendedAttributeTypeInstance) {
             if(params.version) {
                 def version = params.version.toLong()
-                if(assetExtendedAttributeTypeInstance.version > version) {
+                if(extendedAttributeTypeInstance.version > version) {
                     
-                    assetExtendedAttributeTypeInstance.errors.rejectValue("version", "assetExtendedAttributeType.optimistic.locking.failure", "Another user has updated this AssetExtendedAttributeType while you were editing.")
-                    render(view:'edit',model:[assetExtendedAttributeTypeInstance:assetExtendedAttributeTypeInstance])
+                    extendedAttributeTypeInstance.errors.rejectValue("version", "extendedAttributeType.optimistic.locking.failure", "Another user has updated this ExtendedAttributeType while you were editing.")
+                    render(view:'edit',model:[extendedAttributeTypeInstance:extendedAttributeTypeInstance])
                     return
                 }
             }
-            assetExtendedAttributeTypeInstance.properties = params
-            if(!assetExtendedAttributeTypeInstance.hasErrors() && assetExtendedAttributeTypeInstance.save(flush: true)) {
-                flash.message = "AssetExtendedAttributeType ${params.id} updated"
-                redirect(action:show,id:assetExtendedAttributeTypeInstance.id)
+            extendedAttributeTypeInstance.properties = params
+            if(!extendedAttributeTypeInstance.hasErrors() && extendedAttributeTypeInstance.save(flush: true)) {
+                flash.message = "ExtendedAttributeType ${params.id} updated"
+                redirect(action:show,id:extendedAttributeTypeInstance.id)
             }
             else {
-                render(view:'edit',model:[assetExtendedAttributeTypeInstance:assetExtendedAttributeTypeInstance])
+                render(view:'edit',model:[extendedAttributeTypeInstance:extendedAttributeTypeInstance])
             }
         }
         else {
-            flash.message = "AssetExtendedAttributeType not found with id ${params.id}"
+            flash.message = "ExtendedAttributeType not found with id ${params.id}"
             redirect(action:list)
         }
@@ -82 +82 @@
 
     def create = {
-        def assetExtendedAttributeTypeInstance = new AssetExtendedAttributeType()
-        assetExtendedAttributeTypeInstance.properties = params
-        return ['assetExtendedAttributeTypeInstance':assetExtendedAttributeTypeInstance]
+        def extendedAttributeTypeInstance = new ExtendedAttributeType()
+        extendedAttributeTypeInstance.properties = params
+        return ['extendedAttributeTypeInstance':extendedAttributeTypeInstance]
     }
 
     def save = {
-        def assetExtendedAttributeTypeInstance = new AssetExtendedAttributeType(params)
-        if(!assetExtendedAttributeTypeInstance.hasErrors() && assetExtendedAttributeTypeInstance.save(flush: true)) {
-            flash.message = "AssetExtendedAttributeType ${assetExtendedAttributeTypeInstance.id} created"
-            redirect(action:show,id:assetExtendedAttributeTypeInstance.id)
+        def extendedAttributeTypeInstance = new ExtendedAttributeType(params)
+        if(!extendedAttributeTypeInstance.hasErrors() && extendedAttributeTypeInstance.save(flush: true)) {
+            flash.message = "ExtendedAttributeType ${extendedAttributeTypeInstance.id} created"
+            redirect(action:show,id:extendedAttributeTypeInstance.id)
         }
         else {
-            render(view:'create',model:[assetExtendedAttributeTypeInstance:assetExtendedAttributeTypeInstance])
+            render(view:'create',model:[extendedAttributeTypeInstance:extendedAttributeTypeInstance])
         }
     }

trunk/grails-app/controllers/SectionController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class SystemSectionController extends BaseAppAdminController {
+class SectionController extends BaseAppAdminController {
     
     def index = { redirect(action:list,params:params) }
@@ -10 +10 @@
     def list = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ systemSectionInstanceList: SystemSection.list( params ), systemSectionInstanceTotal: SystemSection.count() ]
+        [ sectionInstanceList: Section.list( params ), sectionInstanceTotal: Section.count() ]
     }
 
     def show = {
-        def systemSectionInstance = SystemSection.get( params.id )
+        def sectionInstance = Section.get( params.id )
 
-        if(!systemSectionInstance) {
-            flash.message = "SystemSection not found with id ${params.id}"
+        if(!sectionInstance) {
+            flash.message = "Section not found with id ${params.id}"
             redirect(action:list)
         }
-        else { return [ systemSectionInstance : systemSectionInstance ] }
+        else { return [ sectionInstance : sectionInstance ] }
     }
 
     def delete = {
-        def systemSectionInstance = SystemSection.get( params.id )
-        if(systemSectionInstance) {
+        def sectionInstance = Section.get( params.id )
+        if(sectionInstance) {
             try {
-                systemSectionInstance.delete(flush:true)
-                flash.message = "SystemSection ${params.id} deleted"
+                sectionInstance.delete(flush:true)
+                flash.message = "Section ${params.id} deleted"
                 redirect(action:list)
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "SystemSection ${params.id} could not be deleted"
+                flash.message = "Section ${params.id} could not be deleted"
                 redirect(action:show,id:params.id)
             }
         }
         else {
-            flash.message = "SystemSection not found with id ${params.id}"
+            flash.message = "Section not found with id ${params.id}"
             redirect(action:list)
         }
@@ -43 +43 @@
 
     def edit = {
-        def systemSectionInstance = SystemSection.get( params.id )
+        def sectionInstance = Section.get( params.id )
 
-        if(!systemSectionInstance) {
-            flash.message = "SystemSection not found with id ${params.id}"
+        if(!sectionInstance) {
+            flash.message = "Section not found with id ${params.id}"
             redirect(action:list)
         }
         else {
-            return [ systemSectionInstance : systemSectionInstance ]
+            return [ sectionInstance : sectionInstance ]
         }
     }
 
     def update = {
-        def systemSectionInstance = SystemSection.get( params.id )
-        if(systemSectionInstance) {
+        def sectionInstance = Section.get( params.id )
+        if(sectionInstance) {
             if(params.version) {
                 def version = params.version.toLong()
-                if(systemSectionInstance.version > version) {
+                if(sectionInstance.version > version) {
                     
-                    systemSectionInstance.errors.rejectValue("version", "systemSection.optimistic.locking.failure", "Another user has updated this SystemSection while you were editing.")
-                    render(view:'edit',model:[systemSectionInstance:systemSectionInstance])
+                    sectionInstance.errors.rejectValue("version", "section.optimistic.locking.failure", "Another user has updated this Section while you were editing.")
+                    render(view:'edit',model:[sectionInstance:sectionInstance])
                     return
                 }
             }
-            systemSectionInstance.properties = params
-            if(!systemSectionInstance.hasErrors() && systemSectionInstance.save(flush: true)) {
-                flash.message = "SystemSection ${params.id} updated"
-                redirect(action:show,id:systemSectionInstance.id)
+            sectionInstance.properties = params
+            if(!sectionInstance.hasErrors() && sectionInstance.save(flush: true)) {
+                flash.message = "Section ${params.id} updated"
+                redirect(action:show,id:sectionInstance.id)
             }
             else {
-                render(view:'edit',model:[systemSectionInstance:systemSectionInstance])
+                render(view:'edit',model:[sectionInstance:sectionInstance])
             }
         }
         else {
-            flash.message = "SystemSection not found with id ${params.id}"
+            flash.message = "Section not found with id ${params.id}"
             redirect(action:list)
         }
@@ -82 +82 @@
 
     def create = {
-        def systemSectionInstance = new SystemSection()
-        systemSectionInstance.properties = params
-        return ['systemSectionInstance':systemSectionInstance]
+        def sectionInstance = new Section()
+        sectionInstance.properties = params
+        return ['sectionInstance':sectionInstance]
     }
 
     def save = {
-        def systemSectionInstance = new SystemSection(params)
-        if(!systemSectionInstance.hasErrors() && systemSectionInstance.save(flush: true)) {
-            flash.message = "SystemSection ${systemSectionInstance.id} created"
-            redirect(action:show,id:systemSectionInstance.id)
+        def sectionInstance = new Section(params)
+        if(!sectionInstance.hasErrors() && sectionInstance.save(flush: true)) {
+            flash.message = "Section ${sectionInstance.id} created"
+            redirect(action:show,id:sectionInstance.id)
         }
         else {
-            render(view:'create',model:[systemSectionInstance:systemSectionInstance])
+            render(view:'create',model:[sectionInstance:sectionInstance])
         }
     }

trunk/grails-app/controllers/SectionDetailedController.groovy

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class SystemSectionDetailedController extends BaseController {
+class SectionDetailedController extends BaseController {
     
     def index = { redirect(action:list,params:params) }
@@ -10 +10 @@
     def list = {
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ systemSectionInstanceList: SystemSection.list( params ), systemSectionInstanceTotal: SystemSection.count() ]
+        [ sectionInstanceList: Section.list( params ), sectionInstanceTotal: Section.count() ]
     }
 
     def show = {
-        def systemSectionInstance = SystemSection.get( params.id )
+        def sectionInstance = Section.get( params.id )
 
-        if(!systemSectionInstance) {
-            flash.message = "SystemSection not found with id ${params.id}"
+        if(!sectionInstance) {
+            flash.message = "Section not found with id ${params.id}"
             redirect(action:list)
         }
-        else { return [ systemSectionInstance : systemSectionInstance ] }
+        else { return [ sectionInstance : sectionInstance ] }
     }
 
     def delete = {
-        def systemSectionInstance = SystemSection.get( params.id )
-        if(systemSectionInstance) {
+        def sectionInstance = Section.get( params.id )
+        if(sectionInstance) {
             try {
-                systemSectionInstance.delete(flush:true)
-                flash.message = "SystemSection ${params.id} deleted"
+                sectionInstance.delete(flush:true)
+                flash.message = "Section ${params.id} deleted"
                 redirect(action:list)
             }
             catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "SystemSection ${params.id} could not be deleted"
+                flash.message = "Section ${params.id} could not be deleted"
                 redirect(action:show,id:params.id)
             }
         }
         else {
-            flash.message = "SystemSection not found with id ${params.id}"
+            flash.message = "Section not found with id ${params.id}"
             redirect(action:list)
         }
@@ -43 +43 @@
 
     def edit = {
-        def systemSectionInstance = SystemSection.get( params.id )
+        def sectionInstance = Section.get( params.id )
 
-        if(!systemSectionInstance) {
-            flash.message = "SystemSection not found with id ${params.id}"
+        if(!sectionInstance) {
+            flash.message = "Section not found with id ${params.id}"
             redirect(action:list)
         }
         else {
-            return [ systemSectionInstance : systemSectionInstance ]
+            return [ sectionInstance : sectionInstance ]
         }
     }
 
     def update = {
-        def systemSectionInstance = SystemSection.get( params.id )
-        if(systemSectionInstance) {
+        def sectionInstance = Section.get( params.id )
+        if(sectionInstance) {
             if(params.version) {
                 def version = params.version.toLong()
-                if(systemSectionInstance.version > version) {
+                if(sectionInstance.version > version) {
                     
-                    systemSectionInstance.errors.rejectValue("version", "systemSection.optimistic.locking.failure", "Another user has updated this SystemSection while you were editing.")
-                    render(view:'edit',model:[systemSectionInstance:systemSectionInstance])
+                    sectionInstance.errors.rejectValue("version", "section.optimistic.locking.failure", "Another user has updated this Section while you were editing.")
+                    render(view:'edit',model:[sectionInstance:sectionInstance])
                     return
                 }
             }
-            systemSectionInstance.properties = params
-            if(!systemSectionInstance.hasErrors() && systemSectionInstance.save(flush: true)) {
-                flash.message = "SystemSection ${params.id} updated"
-                redirect(action:show,id:systemSectionInstance.id)
+            sectionInstance.properties = params
+            if(!sectionInstance.hasErrors() && sectionInstance.save(flush: true)) {
+                flash.message = "Section ${params.id} updated"
+                redirect(action:show,id:sectionInstance.id)
             }
             else {
-                render(view:'edit',model:[systemSectionInstance:systemSectionInstance])
+                render(view:'edit',model:[sectionInstance:sectionInstance])
             }
         }
         else {
-            flash.message = "SystemSection not found with id ${params.id}"
+            flash.message = "Section not found with id ${params.id}"
             redirect(action:list)
         }
@@ -82 +82 @@
 
     def create = {
-        def systemSectionInstance = new SystemSection()
-        systemSectionInstance.properties = params
-        return ['systemSectionInstance':systemSectionInstance]
+        def sectionInstance = new Section()
+        sectionInstance.properties = params
+        return ['sectionInstance':sectionInstance]
     }
 
     def save = {
-        def systemSectionInstance = new SystemSection(params)
-        if(!systemSectionInstance.hasErrors() && systemSectionInstance.save(flush: true)) {
-            flash.message = "SystemSection ${systemSectionInstance.id} created"
-            redirect(action:show,id:systemSectionInstance.id)
+        def sectionInstance = new Section(params)
+        if(!sectionInstance.hasErrors() && sectionInstance.save(flush: true)) {
+            flash.message = "Section ${sectionInstance.id} created"
+            redirect(action:show,id:sectionInstance.id)
         }
         else {
-            render(view:'create',model:[systemSectionInstance:systemSectionInstance])
+            render(view:'create',model:[sectionInstance:sectionInstance])
         }
     }