fix #1610 login error only shown on login page

rundeck · Jan 12, 2016 · b35aec8 · b35aec8
1 parent fd6b4b9
commit b35aec8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/rundeckapp/grails-app/controllers/rundeck/controllers/UserController.groovy b/rundeckapp/grails-app/controllers/rundeck/controllers/UserController.groovy
@@ -30,7 +30,7 @@ class UserController extends ControllerBase{
     }
 
     def error = {
-        flash.error="Invalid username and password."
+        flash.loginerror=message(code:"invalid.username.and.password")
         return render(view:'login')
     }
 

diff --git a/rundeckapp/grails-app/i18n/messages.properties b/rundeckapp/grails-app/i18n/messages.properties
@@ -1090,3 +1090,4 @@ jobs.and.ad.hoc.executions.will.be.queued.until.previous.executions.complete=Job
 0.1.threads.in.use={0}/{1} Threads in use.
 quartz.scheduler.thread.usage.is.currently.at=Quartz Scheduler thread usage is currently at {0}
 healthcheck.json=Healthcheck (json)
+invalid.username.and.password=Invalid username and password.
diff --git a/rundeckapp/grails-app/i18n/messages_es_419.properties b/rundeckapp/grails-app/i18n/messages_es_419.properties
@@ -1088,3 +1088,4 @@ jobs.and.ad.hoc.executions.will.be.queued.until.previous.executions.complete=Tra
 0.1.threads.in.use={0}/{1} Subprocesos en uso.
 quartz.scheduler.thread.usage.is.currently.at=Uso de Programador de Cuarzo de Subprocesos se encuentra actualmente en {0}
 healthcheck.json=Chequeo médico (json)
+invalid.username.and.password=Invalid username and password.
diff --git a/rundeckapp/grails-app/views/user/login.gsp b/rundeckapp/grails-app/views/user/login.gsp
@@ -79,9 +79,9 @@
             </div>
         </form>
         </div>
-        <g:if test="${flash.error}">
+        <g:if test="${flash.loginerror}">
             <div class="panel-footer panel-danger">
-                <g:enc>${flash.error}</g:enc>
+                <g:enc>${flash.loginerror}</g:enc>
             </div>
         </g:if>
     </div>