Changeset 1152 for trunk/grails-app/controllers

Timestamp:

Nov 17, 2010, 10:45:55 AM (10 years ago)

Author:

robert@…

Message:

Changed flash.error to flash.userError in the authentication part to resolve #197

Location:

trunk/grails-app/controllers/dbnp/authentication

Files:

• RegisterController.groovy (modified) (3 diffs)
• UserController.groovy (modified) (1 diff)

trunk/grails-app/controllers/dbnp/authentication/RegisterController.groovy

@@ -46 +46 @@
                 String username = params.username
                 if (!username) {
-                        flash.error = message(code: 'spring.security.ui.forgotPassword.username.missing')
+                        flash.userError = message(code: 'spring.security.ui.forgotPassword.username.missing')
                         return
                 }
@@ -52 +52 @@
                 def user = SecUser.findByUsername(username)
                 if (!user) {
-                        flash.error = message(code: 'spring.security.ui.forgotPassword.user.notFound')
+                        flash.userError = message(code: 'spring.security.ui.forgotPassword.user.notFound')
                         return
                 }
@@ -79 +79 @@
                 def registrationCode = token ? RegistrationCode.findByToken(token) : null
                 if (!registrationCode) {
-                        flash.error = message(code: 'spring.security.ui.resetPassword.badCode')
+                        flash.userError = message(code: 'spring.security.ui.resetPassword.badCode')
                         redirect uri: SpringSecurityUtils.securityConfig.successHandler.defaultTargetUrl
                         return

trunk/grails-app/controllers/dbnp/authentication/UserController.groovy

@@ -102 +102 @@
                 }
                 catch (DataIntegrityViolationException e) {
-                        flash.error = "${message(code: 'default.not.deleted.message', args: [message(code: 'user.label', default: 'User'), params.id])}"
+                        flash.userError = "${message(code: 'default.not.deleted.message', args: [message(code: 'user.label', default: 'User'), params.id])}"
                         redirect action: edit, id: params.id
                 }