From ecb445e688e3d38d480acc94a26045d2490fd76a Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 3 Nov 2015 22:39:39 -0500 Subject: [PATCH] dont resolve a promise that hasnt been set up --- awx/ui/client/src/helpers/LoadConfig.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/helpers/LoadConfig.js b/awx/ui/client/src/helpers/LoadConfig.js index 96201ed1f0..ac3d1d54ac 100644 --- a/awx/ui/client/src/helpers/LoadConfig.js +++ b/awx/ui/client/src/helpers/LoadConfig.js @@ -39,19 +39,25 @@ angular.module('LoadConfigHelper', ['Utilities']) if(angular.isObject(response.data)){ $AnsibleConfig = _.extend($AnsibleConfig, response.data); Store('AnsibleConfig', $AnsibleConfig); - $rootScope.loginConfig.resolve('config loaded'); + if ($rootScope.loginConfig) { + $rootScope.loginConfig.resolve('config loaded'); + } $rootScope.$emit('ConfigReady'); } else { $log.info('local_settings.json is not a valid object'); - $rootScope.loginConfig.resolve('config loaded'); + if ($rootScope.loginConfig) { + $rootScope.loginConfig.resolve('config loaded'); + } $rootScope.$emit('ConfigReady'); } }, function() { //local_settings.json not found $log.info('local_settings.json not found'); - $rootScope.loginConfig.resolve('config loaded'); + if ($rootScope.loginConfig) { + $rootScope.loginConfig.resolve('config loaded'); + } $rootScope.$emit('ConfigReady'); }); });