Changeset 294 for trunk/grails-app/controllers

Timestamp:

Jan 24, 2010, 10:21:39 PM (15 years ago)

Author:

gav

Message:

Add custom checkBoxList for personGroups to Person.
Wrap save and update in transactions, tweak role add/remove logic and use a limited role list for non-admin users.

File:

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

trunk/grails-app/controllers/PersonController.groovy

@@ -105 +105 @@
 
     /**
-        * Person update action.
-        */
+    * Person update action.
+    */
     def update = {
-
-        def person = Person.get(params.id)
-        if (!person) {
-            flash.message = "Person not found with id $params.id"
-            redirect action: edit, id: params.id
-            return
-        }
-
-        long version = params.version.toLong()
-        if (person.version > version) {
-            person.errors.rejectValue 'version', "person.optimistic.locking.failure",
-                "Another user has updated this Person while you were editing."
-            render view: 'edit', model: buildPersonModel(person)
-            return
-        }
-
-        person.properties = params
-
-        if(params.pass == "") {
-            person.pass = "InsertNothingToClearValidation"
-        }
-        else {
-            if (person.validate()) {
-                person.password = authenticateService.encodePassword(params.pass)
-            }
-        }
-
-        if (!person.hasErrors() && person.save(flush: true)) {
-            Authority.findAll().each { it.removeFromPersons(person) }
-            addRoles(person)
-            flash.message = "Person '$params.id - $params.loginName' updated."
-            redirect action: show, id: person.id
-        }
-        else {
-            render view: 'edit', model: buildPersonModel(person)
-        }
-
-    }
+        Person.withTransaction { status ->
+
+            def person = Person.get(params.id)
+            if (!person) {
+                flash.message = "Person not found with id $params.id"
+                redirect action: edit, id: params.id
+                return
+            }
+
+            long version = params.version.toLong()
+            if (person.version > version) {
+                person.errors.rejectValue 'version', "person.optimistic.locking.failure",
+                    "Another user has updated this Person while you were editing."
+                render view: 'edit', model: buildPersonModel(person)
+                return
+            }
+
+            person.properties = params
+            person.setPersonGroupsFromCheckBoxList(params.personGroups)
+
+            if(params.pass == "") {
+                person.pass = "InsertNothingToClearValidation"
+            }
+            else {
+                if (person.validate()) {
+                    person.password = authenticateService.encodePassword(params.pass)
+                }
+            }
+
+            if (!person.hasErrors() && person.save(flush: true)) {
+                addRemoveRoles(person)
+                flash.message = "Person '$params.id - $params.loginName' updated."
+                redirect action: show, id: person.id
+            }
+            else {
+                render view: 'edit', model: buildPersonModel(person)
+            }
+
+        } //end withTransaction
+    } // update()
 
     def create = {
         params.message = "To allow login at least the 'ROLE_AppUser' authority must be given."
-        [person: new Person(params), authorityList: Authority.list()]
-    }
-
-    /**
-        * Person save action.
-        */
+        [person: new Person(params), authorityList: getLimitedAuthorityList()]
+    }
+
+    /**
+    * Person save action.
+    */
     def save = {
-
-        def person = new Person()
-        person.properties = params
-        person.password = authenticateService.encodePassword(params.pass)
-        if (person.save(flush: true)) {
-            addRoles(person)
-            redirect action: show, id: person.id
-        }
-        else {
-            render view: 'create', model: [authorityList: Authority.list(), person: person]
-        }
-    }
-
-    private void addRoles(person) {
-        for (String key in params.keySet()) {
-            if (key.contains('ROLE') && 'on' == params.get(key)) {
+        Person.withTransaction { status ->
+
+            def person = new Person()
+            person.properties = params
+            person.password = authenticateService.encodePassword(params.pass)
+            person.setPersonGroupsFromCheckBoxList(params.personGroups)
+            if (person.save(flush: true)) {
+                addRemoveRoles(person)
+                redirect action: show, id: person.id
+            }
+            else {
+                render view: 'create', model: [person: person, authorityList: getLimitedAuthorityList()]
+            }
+
+        } //end withTransaction
+    }
+
+    private void addRemoveRoles(person) {
+        for (key in params.keySet()) {
+            if(key.startsWith("ROLE"))
                 Authority.findByAuthority(key).addToPersons(person)
-            }
+            else if(key.startsWith("_ROLE"))
+                Authority.findByAuthority(key.substring(1)).removeFromPersons(person)
         }
     }
@@ -179 +186 @@
     private Map buildPersonModel(person) {
 
-        List roles = Authority.list()
+        List roles = getLimitedAuthorityList()
         roles.sort { r1, r2 ->
             r1.authority <=> r2.authority
@@ -194 +201 @@
         return [person: person, roleMap: roleMap]
     }
+
+    /**
+    * Get the full authorityList if current user is an App Admin else leave that authority off the list.
+    */
+    def getLimitedAuthorityList = {
+        def authorityList = []
+        if(authenticateService.ifAnyGranted('ROLE_AppAdmin'))
+            authorityList = Authority.list().sort { p1, p2 -> p1.authority.compareToIgnoreCase(p2.authority) }
+        else
+            authorityList = Authority.withCriteria { gt("id", 1L) }.sort { p1, p2 -> p1.authority.compareToIgnoreCase(p2.authority) }
+
+        return authorityList
+    }
 }