1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00

Merge pull request #1232 from mabashian/889-firefox-event

Fixed event error in firefox when logging in
This commit is contained in:
Michael Abashian 2018-04-04 16:13:53 -04:00 committed by GitHub
commit 0d9759102e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -221,7 +221,7 @@ angular
if ($rootScope.removeConfigReady) { if ($rootScope.removeConfigReady) {
$rootScope.removeConfigReady(); $rootScope.removeConfigReady();
} }
$rootScope.removeConfigReady = $rootScope.$on('ConfigReady', function() { $rootScope.removeConfigReady = $rootScope.$on('ConfigReady', function(evt) {
var list, id; var list, id;
// initially set row edit indicator for crud pages // initially set row edit indicator for crud pages
if ($location.$$path && $location.$$path.split("/")[3] && $location.$$path.split("/")[3] === "schedules") { if ($location.$$path && $location.$$path.split("/")[3] && $location.$$path.split("/")[3] === "schedules") {
@ -309,7 +309,7 @@ angular
if (trans.to().name && (trans.to().name !== "signIn" && trans.to().name !== "signOut" && trans.to().name !== "license")) { if (trans.to().name && (trans.to().name !== "signIn" && trans.to().name !== "signOut" && trans.to().name !== "license")) {
ConfigService.getConfig().then(function() { ConfigService.getConfig().then(function() {
// if not headed to /login or /logout, then check the license // if not headed to /login or /logout, then check the license
CheckLicense.test(event); CheckLicense.test(evt);
}); });
} }
} }