External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-02 09:18:48 -03:30
Code Issues Packages Projects Releases Wiki Activity

local_config

Browse Source 
Fixed remaining fallout from delay of $AnsibleConfig object.
This commit is contained in:
Chris Houseknecht
2014-07-25 15:29:31 -04:00
parent e19984d6db
commit b3c41c01b8
5 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
angular.module('LoadConfigHelper', ['Utilities'])
.factory('LoadConfig', ['$log', '$rootScope', '$http', 'ProcessErrors', function($log, $rootScope, $http, ProcessErrors) {
.factory('LoadConfig', ['$log', '$rootScope', '$http', 'ProcessErrors', 'Store', function($log, $rootScope, $http, ProcessErrors, Store) {
return function() {
if ($rootScope.removeLoadConfig) {
@@ -27,6 +27,7 @@ angular.module('LoadConfigHelper', ['Utilities'])
.success(function(data) {
$log.info('loaded config.js');
$AnsibleConfig = eval(data);
Store('AnsibleConfig', $AnsibleConfig);
$rootScope.$emit('ConfigReady');
})
.error(function(data, status) {
@@ -41,6 +42,7 @@ angular.module('LoadConfigHelper', ['Utilities'])
.success(function(data) {
$log.info('loaded local_config.js');
$AnsibleConfig = eval(data);
Store('AnsibleConfig', $AnsibleConfig);
$rootScope.$emit('ConfigReady');
})
.error(function() {