Changeset 97 for trunk/src

Timestamp:

Apr 1, 2009, 5:07:23 AM (16 years ago)

Author:

gav

Message:

Squashed the password validation bug in Person edit

Location:

trunk/src/grails-app

Files:

• controllers/AssignedPersonDetailedController.groovy (modified) (1 diff)
• controllers/PersonController.groovy (modified) (6 diffs)
• views/person/create.gsp (modified) (1 diff)
• views/person/edit.gsp (modified) (2 diffs)

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

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-class AssignedPersonController extends BaseController {
+class AssignedPersonDetailedController extends BaseController {
     
     def index = { redirect(action:list,params:params) }

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

@@ -1 +1 @@
 import org.codehaus.groovy.grails.plugins.springsecurity.Secured
 
-@Secured(['ROLE_AppAdmin', 'ROLE_Manager'])
-class PersonController {
+@Secured(['ROLE_Manager'])
+class PersonController extends BaseAppAdminController {
 
         def authenticateService
@@ -54 +54 @@
                                 Authority.findAll().each { it.removeFromPersons(person) }
                 
-//                 try {
-                    person.delete(flush:true)
+                try {
+                    person.delete()
                     flash.message = "Person $params.id deleted."
-//                 }
-//                 catch(Exception e) {
-//                     flash.message = "Could not delete '$person.loginName' due to database constraints, but all authorities have been removed."
-//                     redirect action: edit, id: person.id
-//                 }
-
+                    redirect(action:list)
+                }
+                catch(org.springframework.dao.DataIntegrityViolationException e) {
+                    flash.message = "Could not delete '$person.loginName' due to database constraints, but all authorities have been removed."
+                    redirect(action:show,id:params.id)
+                }
                         }
                 }
@@ -68 +68 @@
                         flash.message = "Person not found with id $params.id"
                 }
-
-                redirect action: list
         }
 
@@ -100 +98 @@
                         person.errors.rejectValue 'version', "person.optimistic.locking.failure",
                                 "Another user has updated this Person while you were editing."
-                                render view: 'edit', model: buildPersonModel(person)
+            render view: 'edit', model: buildPersonModel(person)
                         return
                 }
@@ -106 +104 @@
                 person.properties = params
 
-        if (person.pass != "") {
-            if (!person.hasErrors()) {
+        if(params.pass == "") {
+            person.pass = "InsertNothingToClearValidation"
+        }
+        else {
+            if (person.validate()) {
                 person.password = authenticateService.encodePassword(params.pass)
             }
-        }
-        else {
-            person.pass = "NothingToClearValidation"
         }
 
@@ -118 +116 @@
             Authority.findAll().each { it.removeFromPersons(person) }
             addRoles(person)
+            flash.message = "Person '$params.id - $params.loginName' updated."
             redirect action: show, id: person.id
         }

trunk/src/grails-app/views/person/create.gsp

@@ -91 +91 @@
 
                                         <tr class="prop">
-                                                <td valign="top" class="name" align="left">Assign Roles:</td>
+                                                <td valign="top" class="name" align="left">Authorities:</td>
                                         </tr>
 

trunk/src/grails-app/views/person/edit.gsp

@@ -59 +59 @@
                                                 <td valign="top" class="name"><label for="pass">Password:</label></td>
                                                 <td valign="top" class="value ${hasErrors(bean:person,field:'pass','errors')}">
-                                                        <input type="password" id="pass" name="pass"/>
+                                                        <input type="password" id="pass" name="pass"  value="${person.pass?.encodeAsHTML()}"/>
                                                 </td>
                                         </tr>
@@ -98 +98 @@
                     </tr>
 
-                                        <tr class="prop">
-                                                <td valign="top" class="name"><label for="authorities">Authorities:</label></td>
-                                                <td valign="top" class="value ${hasErrors(bean:person,field:'authorities','errors')}">
-                                                        <ul>
-                                                        <g:each var="entry" in="${roleMap}">
-                                                                <li>${entry.key.authority.encodeAsHTML()}
-                                                                        <g:checkBox name="${entry.key.authority}" value="${entry.value}"/>
-                                                                </li>
-                                                        </g:each>
-                                                        </ul>
-                                                </td>
-                                        </tr>
+                    <tr class="prop">
+                        <td valign="top" class="name" align="left">Authorities:</td>
+                    </tr>
+
+                    <g:each var="entry" in="${roleMap}">
+                    <tr>
+                        <td valign="top" class="name" align="left">${entry.key.authority.encodeAsHTML()}</td>
+                        <td align="left"><g:checkBox name="${entry.key.authority}" value="${entry.value}"/></td>
+                    </tr>
+                    </g:each>
 
                                 </tbody>