Changeset 147 for trunk/grails-app/controllers/PersonController.groovy

Timestamp:

Oct 8, 2009, 7:58:38 PM (16 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?.

File:

• trunk/grails-app/controllers/PersonController.groovy (modified) (6 diffs)

trunk/grails-app/controllers/PersonController.groovy

@@ -4 +4 @@
 class PersonController extends BaseAppAdminController {
 
-        def authenticateService
+    def authenticateService
+    def filterService
 
         // the delete, save and update actions only accept POST requests
@@ -13 +14 @@
         }
 
-        def list = {
-                if (!params.max) {
-                        params.max = 10
-                }
-                [personList: Person.list(params)]
-        }
+    def list = {
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100 )
+
+        if(!params.filter)
+        { return [personList: Person.list(params), personTotal: Person.count()] }
+
+        // filterPane:
+        return[ personList: filterService.filter( params, Person ),
+            personTotal: filterService.count( params, Person ),
+            filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
+            params:params ]
+    }
 
         def show = {
+
+        // In the case of an actionSubmit button, rewrite action name from 'index'.
+        if(params._action_Show)
+        { params.action='show' }
+
                 def person = Person.get(params.id)
                 if (!person) {
@@ -46 +58 @@
                 if (person) {
                         def authPrincipal = authenticateService.principal()
-                        //avoid self-delete if the logged-in user is an admin
+                        // Avoid self-delete.
                         if (!(authPrincipal instanceof String) && authPrincipal.username == person.loginName) {
-                                flash.message = "You can not delete yourself, please login as another admin and try again"
+                                flash.message = "You cannot delete yourself, please login as another manager and try again."
+                redirect(action:show,id:params.id)
                         }
                         else {
                                 //first, delete this person from Persons_Authorities table.
                                 Authority.findAll().each { it.removeFromPersons(person) }
-                
+                person.isActive = false
+                person.save(flush: true)
+
                 try {
-                    person.delete()
+                    person.delete(flush: true)
                     flash.message = "Person $params.id deleted."
                     redirect(action:list)
@@ -72 +87 @@
         def edit = {
 
+        // In the case of an actionSubmit button, rewrite action name from 'index'.
+        if(params._action_Edit)
+        { params.action='edit' }
+
                 def person = Person.get(params.id)
                 if (!person) {
@@ -78 +97 @@
                         return
                 }
-
+        flash.message = "To allow login at least the 'ROLE_AppUser' authority must be given."
                 return buildPersonModel(person)
         }
@@ -126 +145 @@
 
         def create = {
+        flash.message = "To allow login at least the 'ROLE_AppUser' authority must be given."
                 [person: new Person(params), authorityList: Authority.list()]
         }