External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 22:37:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

loca_config

Browse Source 
Fixed lingering issues where $AnsibleConfig is referenced when it is not yet defined.
This commit is contained in:
Chris Houseknecht
2014-07-25 13:59:34 -04:00
parent de953ec3ed
commit 7139b5b25a
3 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/static/js/helpers/LoadConfig.js
View File

@@ -14,7 +14,7 @@
angular.module('LoadConfigHelper', ['Utilities'])
.factory('LoadConfig', ['$rootScope', '$http', 'ProcessErrors', function($rootScope, $http, ProcessErrors) {
.factory('LoadConfig', ['$log', '$rootScope', '$http', 'ProcessErrors', function($log, $rootScope, $http, ProcessErrors) {
return function() {
if ($rootScope.removeLoadConfig) {
@@ -22,8 +22,10 @@ angular.module('LoadConfigHelper', ['Utilities'])
}
$rootScope.removeLoadConfig = $rootScope.$on('LoadConfig', function() {
// local_config.js not found, so we'll load config.js
$log.info('attempting to load config.js');
$http({ method:'GET', url: $basePath + 'js/config.js' })
.success(function(data) {
$log.info('loaded config.js');
$AnsibleConfig = eval(data);
$rootScope.$emit('ConfigReady');
})
@@ -37,11 +39,13 @@ angular.module('LoadConfigHelper', ['Utilities'])
// Load js/local_config.js
$http({ method:'GET', url: $basePath + 'js/local_config.js' })
.success(function(data) {
$log.info('loaded local_config.js');
$AnsibleConfig = eval(data);
$rootScope.$emit('ConfigReady');
})
.error(function() {
//local_config.js not found
$log.info('local_config.js not found');
$rootScope.$emit('LoadConfig');
});
};