zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-17 21:41:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixing login and submit for new license

Browse Source
This commit is contained in:
Jared Tabor
2016-05-24 15:20:23 -07:00
parent 8b271c4caf
commit 5f52384a3d
6 changed files with 68 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,10 +54,12 @@
* This is usage information.
*/
export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$location', 'Authorization', 'ToggleClass', 'Alert', 'Wait',
'Timer', 'Empty', 'ClearScope', '$scope', 'pendoService',
function ($log, $cookieStore, $compile, $window, $rootScope, $location, Authorization, ToggleClass, Alert, Wait,
Timer, Empty, ClearScope, scope, pendoService) {
export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
'$location', 'Authorization', 'ToggleClass', 'Alert', 'Wait', 'Timer',
'Empty', 'ClearScope', '$scope', 'pendoService', 'ConfigService',
function ($log, $cookieStore, $compile, $window, $rootScope, $location,
Authorization, ToggleClass, Alert, Wait, Timer, Empty, ClearScope,
scope, pendoService, ConfigService) {
var lastPath, lastUser, sessionExpired, loginAgain;
@@ -110,9 +112,10 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
scope.removeAuthorizationGetLicense();
}
scope.removeAuthorizationGetLicense = scope.$on('AuthorizationGetLicense', function() {
Authorization.getLicense()
.success(function (data) {
Authorization.setLicense(data);
// Authorization.getLicense()
// .success(function (data) {
// Authorization.setLicense(data);
ConfigService.getConfig().then(function(){
pendoService.issuePendoIdentity();
Wait("stop");
if (lastPath() && lastUser()) {
@@ -122,7 +125,7 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope', '$l
$location.url('/home');
}
})
.error(function () {
.catch(function () {
Wait('stop');
Alert('Error', 'Failed to access license information. GET returned status: ' + status, 'alert-danger', loginAgain);
});