From 53349cc24db0e5e306c02cb3aac54cc6cc3cb6dd Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Mon, 12 Dec 2016 09:08:42 -0500 Subject: [PATCH] Fixed bug with loading and permissions, error logging and continuing after GET error --- awx/ui/client/src/configuration/configuration.service.js | 2 +- awx/ui/client/src/helpers/LoadConfig.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/configuration/configuration.service.js b/awx/ui/client/src/configuration/configuration.service.js index 9204638c8c..84dac656d0 100644 --- a/awx/ui/client/src/configuration/configuration.service.js +++ b/awx/ui/client/src/configuration/configuration.service.js @@ -16,7 +16,7 @@ export default ['$rootScope', 'GetBasePath', 'ProcessErrors', '$q', '$http', 'Re Rest.setUrl(url + '/all'); Rest.options() .success(function(data) { - if($rootScope.is_superuser) { + if($rootScope.user_is_superuser) { returnData = data.actions.PUT; } else { returnData = data.actions.GET; diff --git a/awx/ui/client/src/helpers/LoadConfig.js b/awx/ui/client/src/helpers/LoadConfig.js index a472c600a9..93d381079b 100644 --- a/awx/ui/client/src/helpers/LoadConfig.js +++ b/awx/ui/client/src/helpers/LoadConfig.js @@ -99,7 +99,8 @@ angular.module('LoadConfigHelper', ['Utilities']) configInit(); }).error(function(error) { - console.log(error); + $log.debug(error); + configInit(); }); };