Index: trunk/grails-app/controllers/AssetSubItemController.groovy =================================================================== --- trunk/grails-app/controllers/AssetSubItemController.groovy (revision 267) +++ trunk/grails-app/controllers/AssetSubItemController.groovy (revision 268) @@ -1,5 +1,5 @@ import org.codehaus.groovy.grails.plugins.springsecurity.Secured -class AssetTypeController extends BaseAppAdminController { +class AssetSubItemController extends BaseAppAdminController { def index = { redirect(action:list,params:params) } @@ -10,32 +10,32 @@ 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,38 +43,38 @@ 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,17 +82,17 @@ 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]) } } Index: trunk/grails-app/controllers/AssetSubItemExtendedAttributeController.groovy =================================================================== --- trunk/grails-app/controllers/AssetSubItemExtendedAttributeController.groovy (revision 268) +++ trunk/grails-app/controllers/AssetSubItemExtendedAttributeController.groovy (revision 268) @@ -0,0 +1,99 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +class AssetSubItemExtendedAttributeController extends BaseAppAdminController { + + def index = { redirect(action:list,params:params) } + + // the delete, save and update actions only accept POST requests + static allowedMethods = [delete:'POST', save:'POST', update:'POST'] + + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ assetSubItemExtendedAttributeInstanceList: AssetSubItemExtendedAttribute.list( params ), assetSubItemExtendedAttributeInstanceTotal: AssetSubItemExtendedAttribute.count() ] + } + + def show = { + def assetSubItemExtendedAttributeInstance = AssetSubItemExtendedAttribute.get( params.id ) + + if(!assetSubItemExtendedAttributeInstance) { + flash.message = "AssetSubItemExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { return [ assetSubItemExtendedAttributeInstance : assetSubItemExtendedAttributeInstance ] } + } + + def delete = { + def assetSubItemExtendedAttributeInstance = AssetSubItemExtendedAttribute.get( params.id ) + if(assetSubItemExtendedAttributeInstance) { + try { + assetSubItemExtendedAttributeInstance.delete(flush:true) + flash.message = "AssetSubItemExtendedAttribute ${params.id} deleted" + redirect(action:list) + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + flash.message = "AssetSubItemExtendedAttribute ${params.id} could not be deleted" + redirect(action:show,id:params.id) + } + } + else { + flash.message = "AssetSubItemExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def assetSubItemExtendedAttributeInstance = AssetSubItemExtendedAttribute.get( params.id ) + + if(!assetSubItemExtendedAttributeInstance) { + flash.message = "AssetSubItemExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { + return [ assetSubItemExtendedAttributeInstance : assetSubItemExtendedAttributeInstance ] + } + } + + def update = { + def assetSubItemExtendedAttributeInstance = AssetSubItemExtendedAttribute.get( params.id ) + if(assetSubItemExtendedAttributeInstance) { + if(params.version) { + def version = params.version.toLong() + if(assetSubItemExtendedAttributeInstance.version > version) { + + assetSubItemExtendedAttributeInstance.errors.rejectValue("version", "assetSubItemExtendedAttribute.optimistic.locking.failure", "Another user has updated this AssetSubItemExtendedAttribute while you were editing.") + render(view:'edit',model:[assetSubItemExtendedAttributeInstance:assetSubItemExtendedAttributeInstance]) + return + } + } + assetSubItemExtendedAttributeInstance.properties = params + if(!assetSubItemExtendedAttributeInstance.hasErrors() && assetSubItemExtendedAttributeInstance.save(flush: true)) { + flash.message = "AssetSubItemExtendedAttribute ${params.id} updated" + redirect(action:show,id:assetSubItemExtendedAttributeInstance.id) + } + else { + render(view:'edit',model:[assetSubItemExtendedAttributeInstance:assetSubItemExtendedAttributeInstance]) + } + } + else { + flash.message = "AssetSubItemExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def assetSubItemExtendedAttributeInstance = new AssetSubItemExtendedAttribute() + assetSubItemExtendedAttributeInstance.properties = params + return ['assetSubItemExtendedAttributeInstance':assetSubItemExtendedAttributeInstance] + } + + def save = { + def assetSubItemExtendedAttributeInstance = new AssetSubItemExtendedAttribute(params) + if(!assetSubItemExtendedAttributeInstance.hasErrors() && assetSubItemExtendedAttributeInstance.save(flush: true)) { + flash.message = "AssetSubItemExtendedAttribute ${assetSubItemExtendedAttributeInstance.id} created" + redirect(action:show,id:assetSubItemExtendedAttributeInstance.id) + } + else { + render(view:'create',model:[assetSubItemExtendedAttributeInstance:assetSubItemExtendedAttributeInstance]) + } + } +} Index: trunk/grails-app/controllers/DepartmentExtendedAttributeController.groovy =================================================================== --- trunk/grails-app/controllers/DepartmentExtendedAttributeController.groovy (revision 268) +++ trunk/grails-app/controllers/DepartmentExtendedAttributeController.groovy (revision 268) @@ -0,0 +1,99 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +class DepartmentExtendedAttributeController extends BaseAppAdminController { + + def index = { redirect(action:list,params:params) } + + // the delete, save and update actions only accept POST requests + static allowedMethods = [delete:'POST', save:'POST', update:'POST'] + + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ departmentExtendedAttributeInstanceList: DepartmentExtendedAttribute.list( params ), departmentExtendedAttributeInstanceTotal: DepartmentExtendedAttribute.count() ] + } + + def show = { + def departmentExtendedAttributeInstance = DepartmentExtendedAttribute.get( params.id ) + + if(!departmentExtendedAttributeInstance) { + flash.message = "DepartmentExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { return [ departmentExtendedAttributeInstance : departmentExtendedAttributeInstance ] } + } + + def delete = { + def departmentExtendedAttributeInstance = DepartmentExtendedAttribute.get( params.id ) + if(departmentExtendedAttributeInstance) { + try { + departmentExtendedAttributeInstance.delete(flush:true) + flash.message = "DepartmentExtendedAttribute ${params.id} deleted" + redirect(action:list) + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + flash.message = "DepartmentExtendedAttribute ${params.id} could not be deleted" + redirect(action:show,id:params.id) + } + } + else { + flash.message = "DepartmentExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def departmentExtendedAttributeInstance = DepartmentExtendedAttribute.get( params.id ) + + if(!departmentExtendedAttributeInstance) { + flash.message = "DepartmentExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { + return [ departmentExtendedAttributeInstance : departmentExtendedAttributeInstance ] + } + } + + def update = { + def departmentExtendedAttributeInstance = DepartmentExtendedAttribute.get( params.id ) + if(departmentExtendedAttributeInstance) { + if(params.version) { + def version = params.version.toLong() + if(departmentExtendedAttributeInstance.version > version) { + + departmentExtendedAttributeInstance.errors.rejectValue("version", "departmentExtendedAttribute.optimistic.locking.failure", "Another user has updated this DepartmentExtendedAttribute while you were editing.") + render(view:'edit',model:[departmentExtendedAttributeInstance:departmentExtendedAttributeInstance]) + return + } + } + departmentExtendedAttributeInstance.properties = params + if(!departmentExtendedAttributeInstance.hasErrors() && departmentExtendedAttributeInstance.save(flush: true)) { + flash.message = "DepartmentExtendedAttribute ${params.id} updated" + redirect(action:show,id:departmentExtendedAttributeInstance.id) + } + else { + render(view:'edit',model:[departmentExtendedAttributeInstance:departmentExtendedAttributeInstance]) + } + } + else { + flash.message = "DepartmentExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def departmentExtendedAttributeInstance = new DepartmentExtendedAttribute() + departmentExtendedAttributeInstance.properties = params + return ['departmentExtendedAttributeInstance':departmentExtendedAttributeInstance] + } + + def save = { + def departmentExtendedAttributeInstance = new DepartmentExtendedAttribute(params) + if(!departmentExtendedAttributeInstance.hasErrors() && departmentExtendedAttributeInstance.save(flush: true)) { + flash.message = "DepartmentExtendedAttribute ${departmentExtendedAttributeInstance.id} created" + redirect(action:show,id:departmentExtendedAttributeInstance.id) + } + else { + render(view:'create',model:[departmentExtendedAttributeInstance:departmentExtendedAttributeInstance]) + } + } +} Index: trunk/grails-app/controllers/ExtendedAttributeTypeController.groovy =================================================================== --- trunk/grails-app/controllers/ExtendedAttributeTypeController.groovy (revision 267) +++ trunk/grails-app/controllers/ExtendedAttributeTypeController.groovy (revision 268) @@ -1,5 +1,5 @@ import org.codehaus.groovy.grails.plugins.springsecurity.Secured -class AssetExtendedAttributeTypeController extends BaseAppAdminController { +class ExtendedAttributeTypeController extends BaseAppAdminController { def index = { redirect(action:list,params:params) } @@ -10,32 +10,32 @@ 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,38 +43,38 @@ 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,17 +82,17 @@ 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]) } } Index: trunk/grails-app/controllers/SectionController.groovy =================================================================== --- trunk/grails-app/controllers/SectionController.groovy (revision 267) +++ trunk/grails-app/controllers/SectionController.groovy (revision 268) @@ -1,5 +1,5 @@ import org.codehaus.groovy.grails.plugins.springsecurity.Secured -class SystemSectionController extends BaseAppAdminController { +class SectionController extends BaseAppAdminController { def index = { redirect(action:list,params:params) } @@ -10,32 +10,32 @@ 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,38 +43,38 @@ 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,17 +82,17 @@ 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]) } } Index: trunk/grails-app/controllers/SectionDetailedController.groovy =================================================================== --- trunk/grails-app/controllers/SectionDetailedController.groovy (revision 267) +++ trunk/grails-app/controllers/SectionDetailedController.groovy (revision 268) @@ -1,5 +1,5 @@ import org.codehaus.groovy.grails.plugins.springsecurity.Secured -class SystemSectionDetailedController extends BaseController { +class SectionDetailedController extends BaseController { def index = { redirect(action:list,params:params) } @@ -10,32 +10,32 @@ 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,38 +43,38 @@ 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,17 +82,17 @@ 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]) } } Index: trunk/grails-app/controllers/SectionExtendedAttributeController.groovy =================================================================== --- trunk/grails-app/controllers/SectionExtendedAttributeController.groovy (revision 268) +++ trunk/grails-app/controllers/SectionExtendedAttributeController.groovy (revision 268) @@ -0,0 +1,99 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +class SectionExtendedAttributeController extends BaseAppAdminController { + + def index = { redirect(action:list,params:params) } + + // the delete, save and update actions only accept POST requests + static allowedMethods = [delete:'POST', save:'POST', update:'POST'] + + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ sectionExtendedAttributeInstanceList: SectionExtendedAttribute.list( params ), sectionExtendedAttributeInstanceTotal: SectionExtendedAttribute.count() ] + } + + def show = { + def sectionExtendedAttributeInstance = SectionExtendedAttribute.get( params.id ) + + if(!sectionExtendedAttributeInstance) { + flash.message = "SectionExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { return [ sectionExtendedAttributeInstance : sectionExtendedAttributeInstance ] } + } + + def delete = { + def sectionExtendedAttributeInstance = SectionExtendedAttribute.get( params.id ) + if(sectionExtendedAttributeInstance) { + try { + sectionExtendedAttributeInstance.delete(flush:true) + flash.message = "SectionExtendedAttribute ${params.id} deleted" + redirect(action:list) + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + flash.message = "SectionExtendedAttribute ${params.id} could not be deleted" + redirect(action:show,id:params.id) + } + } + else { + flash.message = "SectionExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def sectionExtendedAttributeInstance = SectionExtendedAttribute.get( params.id ) + + if(!sectionExtendedAttributeInstance) { + flash.message = "SectionExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { + return [ sectionExtendedAttributeInstance : sectionExtendedAttributeInstance ] + } + } + + def update = { + def sectionExtendedAttributeInstance = SectionExtendedAttribute.get( params.id ) + if(sectionExtendedAttributeInstance) { + if(params.version) { + def version = params.version.toLong() + if(sectionExtendedAttributeInstance.version > version) { + + sectionExtendedAttributeInstance.errors.rejectValue("version", "sectionExtendedAttribute.optimistic.locking.failure", "Another user has updated this SectionExtendedAttribute while you were editing.") + render(view:'edit',model:[sectionExtendedAttributeInstance:sectionExtendedAttributeInstance]) + return + } + } + sectionExtendedAttributeInstance.properties = params + if(!sectionExtendedAttributeInstance.hasErrors() && sectionExtendedAttributeInstance.save(flush: true)) { + flash.message = "SectionExtendedAttribute ${params.id} updated" + redirect(action:show,id:sectionExtendedAttributeInstance.id) + } + else { + render(view:'edit',model:[sectionExtendedAttributeInstance:sectionExtendedAttributeInstance]) + } + } + else { + flash.message = "SectionExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def sectionExtendedAttributeInstance = new SectionExtendedAttribute() + sectionExtendedAttributeInstance.properties = params + return ['sectionExtendedAttributeInstance':sectionExtendedAttributeInstance] + } + + def save = { + def sectionExtendedAttributeInstance = new SectionExtendedAttribute(params) + if(!sectionExtendedAttributeInstance.hasErrors() && sectionExtendedAttributeInstance.save(flush: true)) { + flash.message = "SectionExtendedAttribute ${sectionExtendedAttributeInstance.id} created" + redirect(action:show,id:sectionExtendedAttributeInstance.id) + } + else { + render(view:'create',model:[sectionExtendedAttributeInstance:sectionExtendedAttributeInstance]) + } + } +} Index: trunk/grails-app/controllers/SiteExtendedAttributeController.groovy =================================================================== --- trunk/grails-app/controllers/SiteExtendedAttributeController.groovy (revision 268) +++ trunk/grails-app/controllers/SiteExtendedAttributeController.groovy (revision 268) @@ -0,0 +1,99 @@ +import org.codehaus.groovy.grails.plugins.springsecurity.Secured + +class SiteExtendedAttributeController extends BaseAppAdminController { + + def index = { redirect(action:list,params:params) } + + // the delete, save and update actions only accept POST requests + static allowedMethods = [delete:'POST', save:'POST', update:'POST'] + + def list = { + params.max = Math.min( params.max ? params.max.toInteger() : 10, 100) + [ siteExtendedAttributeInstanceList: SiteExtendedAttribute.list( params ), siteExtendedAttributeInstanceTotal: SiteExtendedAttribute.count() ] + } + + def show = { + def siteExtendedAttributeInstance = SiteExtendedAttribute.get( params.id ) + + if(!siteExtendedAttributeInstance) { + flash.message = "SiteExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { return [ siteExtendedAttributeInstance : siteExtendedAttributeInstance ] } + } + + def delete = { + def siteExtendedAttributeInstance = SiteExtendedAttribute.get( params.id ) + if(siteExtendedAttributeInstance) { + try { + siteExtendedAttributeInstance.delete(flush:true) + flash.message = "SiteExtendedAttribute ${params.id} deleted" + redirect(action:list) + } + catch(org.springframework.dao.DataIntegrityViolationException e) { + flash.message = "SiteExtendedAttribute ${params.id} could not be deleted" + redirect(action:show,id:params.id) + } + } + else { + flash.message = "SiteExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def edit = { + def siteExtendedAttributeInstance = SiteExtendedAttribute.get( params.id ) + + if(!siteExtendedAttributeInstance) { + flash.message = "SiteExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + else { + return [ siteExtendedAttributeInstance : siteExtendedAttributeInstance ] + } + } + + def update = { + def siteExtendedAttributeInstance = SiteExtendedAttribute.get( params.id ) + if(siteExtendedAttributeInstance) { + if(params.version) { + def version = params.version.toLong() + if(siteExtendedAttributeInstance.version > version) { + + siteExtendedAttributeInstance.errors.rejectValue("version", "siteExtendedAttribute.optimistic.locking.failure", "Another user has updated this SiteExtendedAttribute while you were editing.") + render(view:'edit',model:[siteExtendedAttributeInstance:siteExtendedAttributeInstance]) + return + } + } + siteExtendedAttributeInstance.properties = params + if(!siteExtendedAttributeInstance.hasErrors() && siteExtendedAttributeInstance.save(flush: true)) { + flash.message = "SiteExtendedAttribute ${params.id} updated" + redirect(action:show,id:siteExtendedAttributeInstance.id) + } + else { + render(view:'edit',model:[siteExtendedAttributeInstance:siteExtendedAttributeInstance]) + } + } + else { + flash.message = "SiteExtendedAttribute not found with id ${params.id}" + redirect(action:list) + } + } + + def create = { + def siteExtendedAttributeInstance = new SiteExtendedAttribute() + siteExtendedAttributeInstance.properties = params + return ['siteExtendedAttributeInstance':siteExtendedAttributeInstance] + } + + def save = { + def siteExtendedAttributeInstance = new SiteExtendedAttribute(params) + if(!siteExtendedAttributeInstance.hasErrors() && siteExtendedAttributeInstance.save(flush: true)) { + flash.message = "SiteExtendedAttribute ${siteExtendedAttributeInstance.id} created" + redirect(action:show,id:siteExtendedAttributeInstance.id) + } + else { + render(view:'create',model:[siteExtendedAttributeInstance:siteExtendedAttributeInstance]) + } + } +}