Ignore:
Timestamp:
Oct 8, 2009, 7:58:38 PM (15 years ago)
Author:
gav
Message:

Re-install class-diagram from local svn build with patch to allow war deployment.
Class-diagram overrides removed from Config.groovy since these have all been included upstream.
Tidy comments in SecurityConfig?.groovy
Some work on adding assignedPerson work flow and PersonController?.
Add navAlt and filterPane search to Person and TaskProcedure?.

Location:
trunk/grails-app/controllers
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r134 r147  
    22
    33class AssignedPersonDetailedController extends BaseController {
    4    
     4
    55    def index = { redirect(action:list,params:params) }
    66
    … …  
    2727        if(assignedPersonInstance) {
    2828            try {
     29                def taskId = assignedPersonInstance.task.id
    2930                assignedPersonInstance.delete()
    3031                flash.message = "AssignedPerson ${params.id} deleted"
    31                 redirect(action:list)
     32                redirect(controller:"taskDetailed", action:"show", id: taskId)
    3233            }
    3334            catch(org.springframework.dao.DataIntegrityViolationException e) {
    … …  
    6061                def version = params.version.toLong()
    6162                if(assignedPersonInstance.version > version) {
    62                    
     63
    6364                    assignedPersonInstance.errors.rejectValue("version", "assignedPerson.optimistic.locking.failure", "Another user has updated this AssignedPerson while you were editing.")
    6465                    render(view:'edit',model:[assignedPersonInstance:assignedPersonInstance])
    … …  
    8283
    8384    def create = {
    84                 if(!params.task?.id) {
    85                         flash.message = "Please select a task and then 'Add Assigned Person'"
    86                         redirect(controller: "taskDetailed", action: list)
    87                 }
    88                 else {
    89         def assignedPersonInstance = new AssignedPerson()
    90         assignedPersonInstance.properties = params
    91         return ['assignedPersonInstance':assignedPersonInstance]
    92                 }
     85        if(!params.task?.id) {
     86            flash.message = "Please select a task and then 'Add Assigned Person'"
     87            redirect(controller: "taskDetailed", action: list)
     88        }
     89        else {
     90            def assignedPersonInstance = new AssignedPerson()
     91            assignedPersonInstance.properties = params
     92            return ['assignedPersonInstance':assignedPersonInstance]
     93        }
    9394    }
    9495
    9596    def save = {
    9697        def assignedPersonInstance = new AssignedPerson(params)
     98
    9799        if(!assignedPersonInstance.hasErrors() && assignedPersonInstance.save()) {
    98100            flash.message = "AssignedPerson ${assignedPersonInstance.id} created"
    99             redirect(action:show,id:assignedPersonInstance.id)
     101            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
    100102        }
    101103        else {

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

    r98 r147  
    44
    55    def authenticateService
    6    
     6
    77    def index = { redirect(action:list,params:params) }
    88

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

    r136 r147  
    44class PersonController extends BaseAppAdminController {
    55
    6         def authenticateService
     6    def authenticateService
     7    def filterService
    78
    89        // the delete, save and update actions only accept POST requests
    … …  
    1314        }
    1415
    15         def list = {
    16                 if (!params.max) {
    17                         params.max = 10
    18                 }
    19                 [personList: Person.list(params)]
    20         }
     16    def list = {
     17        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100 )
     18
     19        if(!params.filter)
     20        { return [personList: Person.list(params), personTotal: Person.count()] }
     21
     22        // filterPane:
     23        return[ personList: filterService.filter( params, Person ),
     24            personTotal: filterService.count( params, Person ),
     25            filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
     26            params:params ]
     27    }
    2128
    2229        def show = {
     30
     31        // In the case of an actionSubmit button, rewrite action name from 'index'.
     32        if(params._action_Show)
     33        { params.action='show' }
     34
    2335                def person = Person.get(params.id)
    2436                if (!person) {
    … …  
    4658                if (person) {
    4759                        def authPrincipal = authenticateService.principal()
    48                         //avoid self-delete if the logged-in user is an admin
     60                        // Avoid self-delete.
    4961                        if (!(authPrincipal instanceof String) && authPrincipal.username == person.loginName) {
    50                                 flash.message = "You can not delete yourself, please login as another admin and try again"
     62                                flash.message = "You cannot delete yourself, please login as another manager and try again."
     63                redirect(action:show,id:params.id)
    5164                        }
    5265                        else {
    5366                                //first, delete this person from Persons_Authorities table.
    5467                                Authority.findAll().each { it.removeFromPersons(person) }
    55                
     68                person.isActive = false
     69                person.save(flush: true)
     70
    5671                try {
    57                     person.delete()
     72                    person.delete(flush: true)
    5873                    flash.message = "Person $params.id deleted."
    5974                    redirect(action:list)
    … …  
    7287        def edit = {
    7388
     89        // In the case of an actionSubmit button, rewrite action name from 'index'.
     90        if(params._action_Edit)
     91        { params.action='edit' }
     92
    7493                def person = Person.get(params.id)
    7594                if (!person) {
    … …  
    7897                        return
    7998                }
    80 
     99        flash.message = "To allow login at least the 'ROLE_AppUser' authority must be given."
    81100                return buildPersonModel(person)
    82101        }
    … …  
    126145
    127146        def create = {
     147        flash.message = "To allow login at least the 'ROLE_AppUser' authority must be given."
    128148                [person: new Person(params), authorityList: Authority.list()]
    129149        }

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

    r144 r147  
    202202
    203203    def show = {
    204        
     204
    205205        // In the case of an actionSubmit button, rewrite action name from 'index'.
    206206        if(params._action_Show)
    … …  
    286286
    287287    def edit = {
    288        
     288
    289289        // In the case of an actionSubmit button, rewrite action name from 'index'.
    290290        if(params._action_Edit)

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

    r134 r147  
    22
    33class TaskProcedureDetailedController extends BaseController {
    4    
     4
    55    def index = { redirect(action:list,params:params) }
    66
    … …  
    1010    def list = {
    1111        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
    12         [ taskProcedureInstanceList: TaskProcedure.list( params ), taskProcedureInstanceTotal: TaskProcedure.count() ]
     12
     13        if(!params.filter)
     14        { return [taskProcedureInstanceList: TaskProcedure.list(params), taskProcedureInstanceTotal: TaskProcedure.count()] }
     15
     16        // filterPane:
     17        return[ taskProcedureInstanceList: filterService.filter( params, TaskProcedure ),
     18            taskProcedureInstanceTotal: filterService.count( params, TaskProcedure ),
     19            filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
     20            params:params ]
    1321    }
    14        
     22
    1523    def search = {
    1624        redirect(action:list)
    … …  
    1826
    1927    def show = {
     28
     29        // In the case of an actionSubmit button, rewrite action name from 'index'.
     30        if(params._action_Show)
     31        { params.action='show' }
     32
    2033        def taskProcedureInstance = TaskProcedure.get( params.id )
    2134
    … …  
    4760
    4861    def edit = {
     62
     63        // In the case of an actionSubmit button, rewrite action name from 'index'.
     64        if(params._action_Edit)
     65        { params.action='edit' }
     66
    4967        def taskProcedureInstance = TaskProcedure.get( params.id )
    5068
    … …  
    6482                def version = params.version.toLong()
    6583                if(taskProcedureInstance.version > version) {
    66                    
     84
    6785                    taskProcedureInstance.errors.rejectValue("version", "taskProcedure.optimistic.locking.failure", "Another user has updated this TaskProcedure while you were editing.")
    6886                    render(view:'edit',model:[taskProcedureInstance:taskProcedureInstance])
    … …  
    86104
    87105    def create = {
    88                 def taskInstance = Task.get(params.taskInstance?.id)
    89                
    90         def taskProcedureInstance = new TaskProcedure()
    91         taskProcedureInstance.properties = params
    92         return ['taskProcedureInstance':taskProcedureInstance,
    93                                                 taskInstance: taskInstance]
     106        if(params.taskInstance?.id) {
     107            def taskInstance = Task.get(params.taskInstance.id)
     108
     109            def taskProcedureInstance = new TaskProcedure()
     110            taskProcedureInstance.properties = params
     111            return ['taskProcedureInstance':taskProcedureInstance,
     112                            taskInstance: taskInstance]
     113        } else {
     114            flash.message = "Please select a task, then the Procedure tab.'"
     115            redirect(controller:"taskDetailed", action:"list")
     116        }
    94117    }
    95118
    96119    def save = {
    97120        def taskProcedureInstance = new TaskProcedure(params)
    98                 def taskInstance = Task.get(params.taskInstance.id)
    99                                
     121        def taskInstance = Task.get(params.taskInstance.id)
     122
    100123        if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save()) {
    101                         taskProcedureInstance.addToTasks(taskInstance)
    102             flash.message = "TaskProcedure ${taskProcedureInstance.id} created"
     124            taskProcedureInstance.addToTasks(taskInstance)
     125            flash.message = "TaskProcedure ${taskProcedureInstance.id} created."
    103126            redirect(action:show,id:taskProcedureInstance.id)
    104127        }
    105128        else {
    106             render(view:'create',model:[taskProcedureInstance:taskProcedureInstance])
     129            render(view:'create',model:[taskProcedureInstance:taskProcedureInstance, taskInstance: taskInstance])
    107130        }
    108131    }
Note: See TracChangeset for help on using the changeset viewer.