From ea7e15bfc4d54b0609d15f41832a298528b22304 Mon Sep 17 00:00:00 2001
From: beeankha <beeankha@gmail.com>
Date: Mon, 28 Jan 2019 15:16:28 -0500
Subject: [PATCH 1/3] Remove error message for regular logout

---
 .../client/src/login/loginModal/loginModal.partial.html   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/awx/ui/client/src/login/loginModal/loginModal.partial.html b/awx/ui/client/src/login/loginModal/loginModal.partial.html
index 3b6c04454b..af9f006d9c 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.partial.html
+++ b/awx/ui/client/src/login/loginModal/loginModal.partial.html
@@ -14,7 +14,7 @@
                         ng-src="{{ customLogo }}" >
             </div>
             <div class="LoginModal-body">
-                <div class="LoginModal-alert" ng-show="!sessionExpired && !sessionLimitExpired && !attemptFailed && !thirdPartyAttemptFailed && !userLoggedOut" translate>
+                <div class="LoginModal-alert" ng-show="!sessionExpired && !sessionLimitExpired && !attemptFailed && !thirdPartyAttemptFailed" translate>
                     Welcome to Ansible {{BRAND_NAME}}! &nbsp;Please sign in.
                 </div>
                 <div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionExpired">
@@ -23,12 +23,6 @@
                         Your session timed out due to inactivity. Please sign in.
                     </div>
                 </div>
-                <div class="LoginModal-alert LoginModal-alert--error" ng-show="userLoggedOut">
-                    <i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i>
-                    <div class="LoginModal-alertText" translate>
-                        You have been logged out. Please sign in.
-                    </div>
-                </div>
                 <div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionLimitExpired">
                     <i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i>
                     <div class="LoginModal-alertText" translate>

From 5e3d47683dba312f576feb855674b191be843789 Mon Sep 17 00:00:00 2001
From: beeankha <beeankha@gmail.com>
Date: Mon, 28 Jan 2019 16:12:20 -0500
Subject: [PATCH 2/3] Ensure error messages are showing up, but not doubled

---
 .../client/src/login/loginModal/loginModal.partial.html   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/login/loginModal/loginModal.partial.html b/awx/ui/client/src/login/loginModal/loginModal.partial.html
index af9f006d9c..29f435f94a 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.partial.html
+++ b/awx/ui/client/src/login/loginModal/loginModal.partial.html
@@ -14,7 +14,7 @@
                         ng-src="{{ customLogo }}" >
             </div>
             <div class="LoginModal-body">
-                <div class="LoginModal-alert" ng-show="!sessionExpired && !sessionLimitExpired && !attemptFailed && !thirdPartyAttemptFailed" translate>
+                <div class="LoginModal-alert" ng-show="!sessionExpired && !sessionLimitExpired && !attemptFailed && !thirdPartyAttemptFailed && !userLoggedOut" translate>
                     Welcome to Ansible {{BRAND_NAME}}! &nbsp;Please sign in.
                 </div>
                 <div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionExpired">
@@ -23,6 +23,12 @@
                         Your session timed out due to inactivity. Please sign in.
                     </div>
                 </div>
+                <div class="LoginModal-alert LoginModal-alert--error" ng-show="userLoggedOut && !sessionExpired">
+                    <i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i>
+                    <div class="LoginModal-alertText" translate>
+                        You have been logged out. Please sign in.
+                    </div>
+                </div>
                 <div class="LoginModal-alert LoginModal-alert--error" ng-show="sessionLimitExpired">
                     <i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i>
                     <div class="LoginModal-alertText" translate>

From ad3721bdb29ff84edf649d9181ed4c4adc214a3d Mon Sep 17 00:00:00 2001
From: beeankha <beeankha@gmail.com>
Date: Tue, 29 Jan 2019 13:09:28 -0500
Subject: [PATCH 3/3] Ensure all other error messages don't double up with the
 logout message

---
 awx/ui/client/src/login/loginModal/loginModal.partial.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/login/loginModal/loginModal.partial.html b/awx/ui/client/src/login/loginModal/loginModal.partial.html
index 29f435f94a..aa1e5b686a 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.partial.html
+++ b/awx/ui/client/src/login/loginModal/loginModal.partial.html
@@ -23,7 +23,7 @@
                         Your session timed out due to inactivity. Please sign in.
                     </div>
                 </div>
-                <div class="LoginModal-alert LoginModal-alert--error" ng-show="userLoggedOut && !sessionExpired">
+                <div class="LoginModal-alert LoginModal-alert--error" ng-show="userLoggedOut && !sessionExpired && !attemptFailed && !thirdPartyAttemptFailed && !sessionLimitExpired" translate>
                     <i class="LoginModal-alertIcon fa fa-exclamation-triangle"></i>
                     <div class="LoginModal-alertText" translate>
                         You have been logged out. Please sign in.