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 features timing with new config work

Browse Source
This commit is contained in:
Jared Tabor
2016-06-01 14:40:52 -07:00
parent ef935768a5
commit 4466fc80a2
11 changed files with 83 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,9 +57,10 @@
export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
'$location', 'Authorization', 'ToggleClass', 'Alert', 'Wait', 'Timer',
'Empty', 'ClearScope', '$scope', 'pendoService', 'ConfigService',
'CheckLicense', 'FeaturesService',
function ($log, $cookieStore, $compile, $window, $rootScope, $location,
Authorization, ToggleClass, Alert, Wait, Timer, Empty, ClearScope,
scope, pendoService, ConfigService) {
scope, pendoService, ConfigService, CheckLicense, FeaturesService) {
var lastPath, lastUser, sessionExpired, loginAgain;
@@ -116,7 +117,9 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
// .success(function (data) {
// Authorization.setLicense(data);
ConfigService.getConfig().then(function(){
CheckLicense.test();
pendoService.issuePendoIdentity();
FeaturesService.get();
Wait("stop");
if (lastPath() && lastUser()) {
// Go back to most recent navigation path