External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 22:46:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

fixed double login modal on no creds entered

Browse Source
This commit is contained in:
John Mitchell
2015-09-29 10:26:04 -04:00
parent 53a96fd9eb
commit 6342b67245
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/src/login/loginModal/loginModal.controller.js
View File

@@ -179,7 +179,8 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
scope.systemLogin = function (username, password) { scope.systemLogin = function (username, password) {
$('.api-error').empty(); $('.api-error').empty();
if (Empty(username) || Empty(password)) { if (Empty(username) || Empty(password)) {
Alert('Error!', 'Please provide a username and password before attempting to login.', 'alert-danger', setLoginFocus, null, null, false); scope.reset();
scope.attemptFailed = true;
} else { } else {
Wait('start'); Wait('start');
Authorization.retrieveToken(username, password) Authorization.retrieveToken(username, password)
@@ -198,15 +199,6 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
scope[key + 'Error'] = data[key][0]; scope[key + 'Error'] = data[key][0];
} }
} else { } else {
if (data.non_field_errors && data.non_field_errors.length > 0) {
hdr = 'Error';
msg = data.non_field_errors[0];
}
else {
hdr = 'Error';
msg = 'The login attempt failed. The Tower server is not responding. Check that the Tower server processes are running' +
' and accessible.';
}
scope.reset(); scope.reset();
scope.attemptFailed = true; scope.attemptFailed = true;
} }