External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 04:47:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-435 Added 'working' spinner to login dialog

Browse Source
This commit is contained in:
chouseknecht
2013-09-11 00:43:53 -04:00
parent 695a2da790
commit f102fb8ed1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/static/js/controllers/Authentication.js
View File

@@ -10,7 +10,7 @@
'use strict'; 'use strict';
function Authenticate($cookieStore, $window, $scope, $rootScope, $location, Authorization, ToggleClass, Alert) function Authenticate($cookieStore, $window, $scope, $rootScope, $location, Authorization, ToggleClass, Alert, Wait)
{ {
var setLoginFocus = function() { var setLoginFocus = function() {
$('#login-username').focus(); $('#login-username').focus();
@@ -60,12 +60,13 @@ function Authenticate($cookieStore, $window, $scope, $rootScope, $location, Auth
Alert('Error!', 'Please provide a username and password before attempting to login.', 'alert-danger', setLoginFocus); Alert('Error!', 'Please provide a username and password before attempting to login.', 'alert-danger', setLoginFocus);
} }
else { else {
Wait('start');
Authorization.retrieveToken(username, password) Authorization.retrieveToken(username, password)
.success( function(data, status, headers, config) { .success( function(data, status, headers, config) {
Wait('stop');
$('#login-modal').modal('hide'); $('#login-modal').modal('hide');
token = data.token; token = data.token;
Authorization.setToken(data.token, data.expires); Authorization.setToken(data.token, data.expires);
// Get all the profile/access info regarding the logged in user // Get all the profile/access info regarding the logged in user
Authorization.getUser() Authorization.getUser()
.success(function(data, status, headers, config) { .success(function(data, status, headers, config) {
@@ -84,6 +85,7 @@ function Authenticate($cookieStore, $window, $scope, $rootScope, $location, Auth
}); });
}) })
.error( function(data, status, headers, config) { .error( function(data, status, headers, config) {
Wait('stop');
if ( data.non_field_errors && data.non_field_errors.length == 0 ) { if ( data.non_field_errors && data.non_field_errors.length == 0 ) {
// show field specific errors returned by the API // show field specific errors returned by the API
for (var key in data) { for (var key in data) {
@@ -108,5 +110,5 @@ function Authenticate($cookieStore, $window, $scope, $rootScope, $location, Auth
} }
} }
Authenticate.$inject = ['$cookieStore', '$window', '$scope', '$rootScope', '$location', 'Authorization', 'ToggleClass', 'Alert']; Authenticate.$inject = ['$cookieStore', '$window', '$scope', '$rootScope', '$location', 'Authorization', 'ToggleClass', 'Alert', 'Wait'];