From b35aec871f07fe66d0bb2df2c018ca93ee3b0ba1 Mon Sep 17 00:00:00 2001
From: Greg Schueler <greg.schueler@gmail.com>
Date: Tue, 12 Jan 2016 11:45:15 -0800
Subject: [PATCH] fix #1610 login error only shown on login page

---
 .../controllers/rundeck/controllers/UserController.groovy     | 2 +-
 rundeckapp/grails-app/i18n/messages.properties                | 1 +
 rundeckapp/grails-app/i18n/messages_es_419.properties         | 1 +
 rundeckapp/grails-app/views/user/login.gsp                    | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rundeckapp/grails-app/controllers/rundeck/controllers/UserController.groovy b/rundeckapp/grails-app/controllers/rundeck/controllers/UserController.groovy
index ba86db5f325..c4e0b76ae4c 100644
--- 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
index 8540b0e5070..2620603e345 100644
--- 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
index d7ff4ab7378..1b1b63d325a 100644
--- 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
index ecae573f65f..7359450217b 100644
--- 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>