zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-26 09:51:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

updating $cookieStore to $cookie

Browse Source 
b/c it was deprecated in Angular 1.4
This commit is contained in:
jaredevantabor
2017-03-02 13:10:19 -08:00
parent a4e60b711f
commit a2a0a3194f
7 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,11 +54,11 @@
* This is usage information.
*/
export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
export default ['$log', '$cookies', '$compile', '$window', '$rootScope',
'$location', 'Authorization', 'ToggleClass', 'Alert', 'Wait', 'Timer',
'Empty', 'ClearScope', '$scope', 'pendoService', 'ConfigService',
'CheckLicense', 'FeaturesService', 'SocketService',
function ($log, $cookieStore, $compile, $window, $rootScope, $location,
function ($log, $cookies, $compile, $window, $rootScope, $location,
Authorization, ToggleClass, Alert, Wait, Timer, Empty, ClearScope,
scope, pendoService, ConfigService, CheckLicense, FeaturesService,
SocketService) {
@@ -70,13 +70,13 @@ export default ['$log', '$cookieStore', '$compile', '$window', '$rootScope',
}, 1000);
};
scope.sessionExpired = (Empty($rootScope.sessionExpired)) ? $cookieStore.get('sessionExpired') : $rootScope.sessionExpired;
scope.sessionExpired = (Empty($rootScope.sessionExpired)) ? $cookies.get('sessionExpired') : $rootScope.sessionExpired;
scope.login_username = '';
scope.login_password = '';
lastPath = function () {
return (Empty($rootScope.lastPath)) ? $cookieStore.get('lastPath') : $rootScope.lastPath;
return (Empty($rootScope.lastPath)) ? $cookies.get('lastPath') : $rootScope.lastPath;
};
lastUser = function(){