Changeset 73 for branches/TaskRewrite/src/grails-app/controllers/PersonController.groovy

Timestamp:

Mar 14, 2009, 10:04:39 AM (16 years ago)

Author:

gav

Message:

Add changePassword under options view so that users can change their own password.
Adjust for password validation, userCache etc. Only a small bug during "edit" is left on second "update" command.

File:

• branches/TaskRewrite/src/grails-app/controllers/PersonController.groovy (modified) (2 diffs)

branches/TaskRewrite/src/grails-app/controllers/PersonController.groovy

@@ -96 +96 @@
                 }
 
-                def oldPassword = person.password
                 person.properties = params
-                if (!params.password.equals(oldPassword)) {
-                        person.password = authenticateService.encodePassword(params.password)
-                }
-                if (person.save()) {
-                        Authority.findAll().each { it.removeFromPersons(person) }
-                        addRoles(person)
-                        redirect action: show, id: person.id
-                }
-                else {
-                        render view: 'edit', model: buildPersonModel(person)
-                }
+
+        if (person.pass != "") {
+            if (!person.hasErrors()) {
+                person.password = authenticateService.encodePassword(params.pass)
+            }
+        }
+        else {
+            person.pass = "NothingToClearValidation"
+        }
+
+        if (!person.hasErrors() && person.save()) {
+            Authority.findAll().each { it.removeFromPersons(person) }
+            addRoles(person)
+            redirect action: show, id: person.id
+        }
+        else {
+            render view: 'edit', model: buildPersonModel(person)
+        }
+
         }
 
@@ -122 +129 @@
                 def person = new Person()
                 person.properties = params
-                person.password = authenticateService.encodePassword(params.password)
+                person.password = authenticateService.encodePassword(params.pass)
                 if (person.save()) {
                         addRoles(person)