Ignore:
Timestamp:
May 1, 2009, 3:27:41 PM (16 years ago)
Author:
gav
Message:

Run generate-all on all controllers and views except Person and Authority.
Extensive work on Asset domain and application now compiles and runs well.
Update BootStrap? to suite.

Location:
trunk/grails-app/controllers
Files:
6 added
1 deleted
10 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/grails-app/controllers/EntryController.groovy

    r116 r122  
    99
    1010    def list = {
    11         if(!params.max) params.max = 10
    12         [ entryInstanceList: Entry.list( params ) ]
     11        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
     12        [ entryInstanceList: Entry.list( params ), entryInstanceTotal: Entry.count() ]
    1313    }
    1414
    … …  
    2626        def entryInstance = Entry.get( params.id )
    2727        if(entryInstance) {
    28             entryInstance.delete()
    29             flash.message = "Entry ${params.id} deleted"
    30             redirect(action:list)
     28            try {
     29                entryInstance.delete()
     30                flash.message = "Entry ${params.id} deleted"
     31                redirect(action:list)
     32            }
     33            catch(org.springframework.dao.DataIntegrityViolationException e) {
     34                flash.message = "Entry ${params.id} could not be deleted"
     35                redirect(action:show,id:params.id)
     36            }
    3137        }
    3238        else {
    … …  
    5157        def entryInstance = Entry.get( params.id )
    5258        if(entryInstance) {
     59            if(params.version) {
     60                def version = params.version.toLong()
     61                if(entryInstance.version > version) {
     62                   
     63                    entryInstance.errors.rejectValue("version", "entry.optimistic.locking.failure", "Another user has updated this Entry while you were editing.")
     64                    render(view:'edit',model:[entryInstance:entryInstance])
     65                    return
     66                }
     67            }
    5368            entryInstance.properties = params
    5469            if(!entryInstance.hasErrors() && entryInstance.save()) {

  • trunk/grails-app/controllers/EntryTypeController.groovy

    r116 r122  
    99
    1010    def list = {
    11         if(!params.max) params.max = 10
    12         [ entryTypeInstanceList: EntryType.list( params ) ]
     11        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
     12        [ entryTypeInstanceList: EntryType.list( params ), entryTypeInstanceTotal: EntryType.count() ]
    1313    }
    1414
    … …  
    2626        def entryTypeInstance = EntryType.get( params.id )
    2727        if(entryTypeInstance) {
    28             entryTypeInstance.delete()
    29             flash.message = "EntryType ${params.id} deleted"
    30             redirect(action:list)
     28            try {
     29                entryTypeInstance.delete()
     30                flash.message = "EntryType ${params.id} deleted"
     31                redirect(action:list)
     32            }
     33            catch(org.springframework.dao.DataIntegrityViolationException e) {
     34                flash.message = "EntryType ${params.id} could not be deleted"
     35                redirect(action:show,id:params.id)
     36            }
    3137        }
    3238        else {
    … …  
    5157        def entryTypeInstance = EntryType.get( params.id )
    5258        if(entryTypeInstance) {
     59            if(params.version) {
     60                def version = params.version.toLong()
     61                if(entryTypeInstance.version > version) {
     62                   
     63                    entryTypeInstance.errors.rejectValue("version", "entryType.optimistic.locking.failure", "Another user has updated this EntryType while you were editing.")
     64                    render(view:'edit',model:[entryTypeInstance:entryTypeInstance])
     65                    return
     66                }
     67            }
    5368            entryTypeInstance.properties = params
    5469            if(!entryTypeInstance.hasErrors() && entryTypeInstance.save()) {

  • trunk/grails-app/controllers/PeriodController.groovy

    r120 r122  
    11import org.codehaus.groovy.grails.plugins.springsecurity.Secured
    22
    3 class FrequencyController extends BaseAppAdminController {
     3class PeriodController extends BaseAppAdminController {
    44   
    55    def index = { redirect(action:list,params:params) }
    … …  
    1010    def list = {
    1111        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
    12         [ frequencyInstanceList: Frequency.list( params ), frequencyInstanceTotal: Frequency.count() ]
     12        [ periodInstanceList: Period.list( params ), periodInstanceTotal: Period.count() ]
    1313    }
    1414
    1515    def show = {
    16         def frequencyInstance = Frequency.get( params.id )
     16        def periodInstance = Period.get( params.id )
    1717
    18         if(!frequencyInstance) {
    19             flash.message = "Frequency not found with id ${params.id}"
     18        if(!periodInstance) {
     19            flash.message = "Period not found with id ${params.id}"
    2020            redirect(action:list)
    2121        }
    22         else { return [ frequencyInstance : frequencyInstance ] }
     22        else { return [ periodInstance : periodInstance ] }
    2323    }
    2424
    2525    def delete = {
    26         def frequencyInstance = Frequency.get( params.id )
    27         if(frequencyInstance) {
     26        def periodInstance = Period.get( params.id )
     27        if(periodInstance) {
    2828            try {
    29                 frequencyInstance.delete()
    30                 flash.message = "Frequency ${params.id} deleted"
     29                periodInstance.delete()
     30                flash.message = "Period ${params.id} deleted"
    3131                redirect(action:list)
    3232            }
    3333            catch(org.springframework.dao.DataIntegrityViolationException e) {
    34                 flash.message = "Frequency ${params.id} could not be deleted"
     34                flash.message = "Period ${params.id} could not be deleted"
    3535                redirect(action:show,id:params.id)
    3636            }
    3737        }
    3838        else {
    39             flash.message = "Frequency not found with id ${params.id}"
     39            flash.message = "Period not found with id ${params.id}"
    4040            redirect(action:list)
    4141        }
    … …  
    4343
    4444    def edit = {
    45         def frequencyInstance = Frequency.get( params.id )
     45        def periodInstance = Period.get( params.id )
    4646
    47         if(!frequencyInstance) {
    48             flash.message = "Frequency not found with id ${params.id}"
     47        if(!periodInstance) {
     48            flash.message = "Period not found with id ${params.id}"
    4949            redirect(action:list)
    5050        }
    5151        else {
    52             return [ frequencyInstance : frequencyInstance ]
     52            return [ periodInstance : periodInstance ]
    5353        }
    5454    }
    5555
    5656    def update = {
    57         def frequencyInstance = Frequency.get( params.id )
    58         if(frequencyInstance) {
     57        def periodInstance = Period.get( params.id )
     58        if(periodInstance) {
    5959            if(params.version) {
    6060                def version = params.version.toLong()
    61                 if(frequencyInstance.version > version) {
     61                if(periodInstance.version > version) {
    6262                   
    63                     frequencyInstance.errors.rejectValue("version", "frequency.optimistic.locking.failure", "Another user has updated this Frequency while you were editing.")
    64                     render(view:'edit',model:[frequencyInstance:frequencyInstance])
     63                    periodInstance.errors.rejectValue("version", "period.optimistic.locking.failure", "Another user has updated this Period while you were editing.")
     64                    render(view:'edit',model:[periodInstance:periodInstance])
    6565                    return
    6666                }
    6767            }
    68             frequencyInstance.properties = params
    69             if(!frequencyInstance.hasErrors() && frequencyInstance.save()) {
    70                 flash.message = "Frequency ${params.id} updated"
    71                 redirect(action:show,id:frequencyInstance.id)
     68            periodInstance.properties = params
     69            if(!periodInstance.hasErrors() && periodInstance.save()) {
     70                flash.message = "Period ${params.id} updated"
     71                redirect(action:show,id:periodInstance.id)
    7272            }
    7373            else {
    74                 render(view:'edit',model:[frequencyInstance:frequencyInstance])
     74                render(view:'edit',model:[periodInstance:periodInstance])
    7575            }
    7676        }
    7777        else {
    78             flash.message = "Frequency not found with id ${params.id}"
     78            flash.message = "Period not found with id ${params.id}"
    7979            redirect(action:edit,id:params.id)
    8080        }
    … …  
    8282
    8383    def create = {
    84         def frequencyInstance = new Frequency()
    85         frequencyInstance.properties = params
    86         return ['frequencyInstance':frequencyInstance]
     84        def periodInstance = new Period()
     85        periodInstance.properties = params
     86        return ['periodInstance':periodInstance]
    8787    }
    8888
    8989    def save = {
    90         def frequencyInstance = new Frequency(params)
    91         if(!frequencyInstance.hasErrors() && frequencyInstance.save()) {
    92             flash.message = "Frequency ${frequencyInstance.id} created"
    93             redirect(action:show,id:frequencyInstance.id)
     90        def periodInstance = new Period(params)
     91        if(!periodInstance.hasErrors() && periodInstance.save()) {
     92            flash.message = "Period ${periodInstance.id} created"
     93            redirect(action:show,id:periodInstance.id)
    9494        }
    9595        else {
    96             render(view:'create',model:[frequencyInstance:frequencyInstance])
     96            render(view:'create',model:[periodInstance:periodInstance])
    9797        }
    9898    }

  • trunk/grails-app/controllers/PersonGroupController.groovy

    r116 r122  
    22
    33class PersonGroupController extends BaseAppAdminController {
    4 
     4   
    55    def index = { redirect(action:list,params:params) }
    66
    … …  
    99
    1010    def list = {
    11         if(!params.max) params.max = 10
    12         [ personGroupInstanceList: PersonGroup.list( params ) ]
     11        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
     12        [ personGroupInstanceList: PersonGroup.list( params ), personGroupInstanceTotal: PersonGroup.count() ]
    1313    }
    1414
    … …  
    2626        def personGroupInstance = PersonGroup.get( params.id )
    2727        if(personGroupInstance) {
    28             personGroupInstance.delete()
    29             flash.message = "PersonGroup ${params.id} deleted"
    30             redirect(action:list)
     28            try {
     29                personGroupInstance.delete()
     30                flash.message = "PersonGroup ${params.id} deleted"
     31                redirect(action:list)
     32            }
     33            catch(org.springframework.dao.DataIntegrityViolationException e) {
     34                flash.message = "PersonGroup ${params.id} could not be deleted"
     35                redirect(action:show,id:params.id)
     36            }
    3137        }
    3238        else {
    … …  
    5157        def personGroupInstance = PersonGroup.get( params.id )
    5258        if(personGroupInstance) {
     59            if(params.version) {
     60                def version = params.version.toLong()
     61                if(personGroupInstance.version > version) {
     62                   
     63                    personGroupInstance.errors.rejectValue("version", "personGroup.optimistic.locking.failure", "Another user has updated this PersonGroup while you were editing.")
     64                    render(view:'edit',model:[personGroupInstance:personGroupInstance])
     65                    return
     66                }
     67            }
    5368            personGroupInstance.properties = params
    5469            if(!personGroupInstance.hasErrors() && personGroupInstance.save()) {

  • trunk/grails-app/controllers/PersonGroupTypeController.groovy

    r116 r122  
    22
    33class PersonGroupTypeController extends BaseAppAdminController {
    4 
     4   
    55    def index = { redirect(action:list,params:params) }
    66
    … …  
    99
    1010    def list = {
    11         if(!params.max) params.max = 10
    12         [ personGroupTypeInstanceList: PersonGroupType.list( params ) ]
     11        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
     12        [ personGroupTypeInstanceList: PersonGroupType.list( params ), personGroupTypeInstanceTotal: PersonGroupType.count() ]
    1313    }
    1414
    … …  
    2626        def personGroupTypeInstance = PersonGroupType.get( params.id )
    2727        if(personGroupTypeInstance) {
    28             personGroupTypeInstance.delete()
    29             flash.message = "PersonGroupType ${params.id} deleted"
    30             redirect(action:list)
     28            try {
     29                personGroupTypeInstance.delete()
     30                flash.message = "PersonGroupType ${params.id} deleted"
     31                redirect(action:list)
     32            }
     33            catch(org.springframework.dao.DataIntegrityViolationException e) {
     34                flash.message = "PersonGroupType ${params.id} could not be deleted"
     35                redirect(action:show,id:params.id)
     36            }
    3137        }
    3238        else {
    … …  
    5157        def personGroupTypeInstance = PersonGroupType.get( params.id )
    5258        if(personGroupTypeInstance) {
     59            if(params.version) {
     60                def version = params.version.toLong()
     61                if(personGroupTypeInstance.version > version) {
     62                   
     63                    personGroupTypeInstance.errors.rejectValue("version", "personGroupType.optimistic.locking.failure", "Another user has updated this PersonGroupType while you were editing.")
     64                    render(view:'edit',model:[personGroupTypeInstance:personGroupTypeInstance])
     65                    return
     66                }
     67            }
    5368            personGroupTypeInstance.properties = params
    5469            if(!personGroupTypeInstance.hasErrors() && personGroupTypeInstance.save()) {

  • trunk/grails-app/controllers/StoredItemController.groovy

    r116 r122  
    11import org.codehaus.groovy.grails.plugins.springsecurity.Secured
    22
    3 class StoredItemController extends BaseAppAdminController  {
     3class StoredItemController extends BaseAppAdminController {
    44   
    55    def index = { redirect(action:list,params:params) }

  • trunk/grails-app/controllers/TaskGroupController.groovy

    r116 r122  
    99
    1010    def list = {
    11         if(!params.max) params.max = 10
    12         [ taskGroupInstanceList: TaskGroup.list( params ) ]
     11        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
     12        [ taskGroupInstanceList: TaskGroup.list( params ), taskGroupInstanceTotal: TaskGroup.count() ]
    1313    }
    1414
    … …  
    2626        def taskGroupInstance = TaskGroup.get( params.id )
    2727        if(taskGroupInstance) {
    28             taskGroupInstance.delete()
    29             flash.message = "TaskGroup ${params.id} deleted"
    30             redirect(action:list)
     28            try {
     29                taskGroupInstance.delete()
     30                flash.message = "TaskGroup ${params.id} deleted"
     31                redirect(action:list)
     32            }
     33            catch(org.springframework.dao.DataIntegrityViolationException e) {
     34                flash.message = "TaskGroup ${params.id} could not be deleted"
     35                redirect(action:show,id:params.id)
     36            }
    3137        }
    3238        else {
    … …  
    5157        def taskGroupInstance = TaskGroup.get( params.id )
    5258        if(taskGroupInstance) {
     59            if(params.version) {
     60                def version = params.version.toLong()
     61                if(taskGroupInstance.version > version) {
     62                   
     63                    taskGroupInstance.errors.rejectValue("version", "taskGroup.optimistic.locking.failure", "Another user has updated this TaskGroup while you were editing.")
     64                    render(view:'edit',model:[taskGroupInstance:taskGroupInstance])
     65                    return
     66                }
     67            }
    5368            taskGroupInstance.properties = params
    5469            if(!taskGroupInstance.hasErrors() && taskGroupInstance.save()) {

  • trunk/grails-app/controllers/TaskModificationTypeController.groovy

    r116 r122  
    11import org.codehaus.groovy.grails.plugins.springsecurity.Secured
    22
    3 class TaskModificationTypeController extends BaseAppAdminController{
     3class TaskModificationTypeController extends BaseAppAdminController {
    44   
    55    def index = { redirect(action:list,params:params) }

  • trunk/grails-app/controllers/TaskPriorityController.groovy

    r116 r122  
    99
    1010    def list = {
    11         if(!params.max) params.max = 10
    12         [ taskPriorityInstanceList: TaskPriority.list( params ) ]
     11        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
     12        [ taskPriorityInstanceList: TaskPriority.list( params ), taskPriorityInstanceTotal: TaskPriority.count() ]
    1313    }
    1414
    … …  
    2626        def taskPriorityInstance = TaskPriority.get( params.id )
    2727        if(taskPriorityInstance) {
    28             taskPriorityInstance.delete()
    29             flash.message = "TaskPriority ${params.id} deleted"
    30             redirect(action:list)
     28            try {
     29                taskPriorityInstance.delete()
     30                flash.message = "TaskPriority ${params.id} deleted"
     31                redirect(action:list)
     32            }
     33            catch(org.springframework.dao.DataIntegrityViolationException e) {
     34                flash.message = "TaskPriority ${params.id} could not be deleted"
     35                redirect(action:show,id:params.id)
     36            }
    3137        }
    3238        else {
    … …  
    5157        def taskPriorityInstance = TaskPriority.get( params.id )
    5258        if(taskPriorityInstance) {
     59            if(params.version) {
     60                def version = params.version.toLong()
     61                if(taskPriorityInstance.version > version) {
     62                   
     63                    taskPriorityInstance.errors.rejectValue("version", "taskPriority.optimistic.locking.failure", "Another user has updated this TaskPriority while you were editing.")
     64                    render(view:'edit',model:[taskPriorityInstance:taskPriorityInstance])
     65                    return
     66                }
     67            }
    5368            taskPriorityInstance.properties = params
    5469            if(!taskPriorityInstance.hasErrors() && taskPriorityInstance.save()) {

  • trunk/grails-app/controllers/TaskStatusController.groovy

    r116 r122  
    99
    1010    def list = {
    11         if(!params.max) params.max = 10
    12         [ taskStatusInstanceList: TaskStatus.list( params ) ]
     11        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
     12        [ taskStatusInstanceList: TaskStatus.list( params ), taskStatusInstanceTotal: TaskStatus.count() ]
    1313    }
    1414
    … …  
    2626        def taskStatusInstance = TaskStatus.get( params.id )
    2727        if(taskStatusInstance) {
    28             taskStatusInstance.delete()
    29             flash.message = "TaskStatus ${params.id} deleted"
    30             redirect(action:list)
     28            try {
     29                taskStatusInstance.delete()
     30                flash.message = "TaskStatus ${params.id} deleted"
     31                redirect(action:list)
     32            }
     33            catch(org.springframework.dao.DataIntegrityViolationException e) {
     34                flash.message = "TaskStatus ${params.id} could not be deleted"
     35                redirect(action:show,id:params.id)
     36            }
    3137        }
    3238        else {
    … …  
    5157        def taskStatusInstance = TaskStatus.get( params.id )
    5258        if(taskStatusInstance) {
     59            if(params.version) {
     60                def version = params.version.toLong()
     61                if(taskStatusInstance.version > version) {
     62                   
     63                    taskStatusInstance.errors.rejectValue("version", "taskStatus.optimistic.locking.failure", "Another user has updated this TaskStatus while you were editing.")
     64                    render(view:'edit',model:[taskStatusInstance:taskStatusInstance])
     65                    return
     66                }
     67            }
    5368            taskStatusInstance.properties = params
    5469            if(!taskStatusInstance.hasErrors() && taskStatusInstance.save()) {

  • trunk/grails-app/controllers/TaskTypeController.groovy

    r116 r122  
    99
    1010    def list = {
    11         if(!params.max) params.max = 10
    12         [ taskTypeInstanceList: TaskType.list( params ) ]
     11        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
     12        [ taskTypeInstanceList: TaskType.list( params ), taskTypeInstanceTotal: TaskType.count() ]
    1313    }
    1414
    … …  
    2626        def taskTypeInstance = TaskType.get( params.id )
    2727        if(taskTypeInstance) {
    28             taskTypeInstance.delete()
    29             flash.message = "TaskType ${params.id} deleted"
    30             redirect(action:list)
     28            try {
     29                taskTypeInstance.delete()
     30                flash.message = "TaskType ${params.id} deleted"
     31                redirect(action:list)
     32            }
     33            catch(org.springframework.dao.DataIntegrityViolationException e) {
     34                flash.message = "TaskType ${params.id} could not be deleted"
     35                redirect(action:show,id:params.id)
     36            }
    3137        }
    3238        else {
    … …  
    5157        def taskTypeInstance = TaskType.get( params.id )
    5258        if(taskTypeInstance) {
     59            if(params.version) {
     60                def version = params.version.toLong()
     61                if(taskTypeInstance.version > version) {
     62                   
     63                    taskTypeInstance.errors.rejectValue("version", "taskType.optimistic.locking.failure", "Another user has updated this TaskType while you were editing.")
     64                    render(view:'edit',model:[taskTypeInstance:taskTypeInstance])
     65                    return
     66                }
     67            }
    5368            taskTypeInstance.properties = params
    5469            if(!taskTypeInstance.hasErrors() && taskTypeInstance.save()) {
Note: See TracChangeset for help on using the changeset viewer.