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

[system_tracking] Ensure 401 errors in resolver handles sign out

Browse Source
This commit is contained in:
Joe Fiorini
2015-06-19 14:31:55 -04:00
parent c8744a8e8f
commit b6c18fcc13
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
awx/ui/static/js/system-tracking/system-tracking.route.js
View File

@@ -15,12 +15,20 @@ export default {
moduleOptions: moduleOptions:
[ 'getModuleOptions', [ 'getModuleOptions',
'lodashAsPromised', 'lodashAsPromised',
'ProcessErrors',
'$route', '$route',
function(getModuleOptions, _, $route) { function(getModuleOptions, _, ProcessErrors, $route) {
var hostIds = $route.current.params.hosts.split(','); var hostIds = $route.current.params.hosts.split(',');
var data = var data =
getModuleOptions(hostIds[0]) getModuleOptions(hostIds[0])
.catch(function (response) {
ProcessErrors(null, response.data, response.status, null, {
hdr: 'Error!',
msg: 'Failed to get license info. GET returned status: ' +
response.status
});
})
.value(); .value();
return data; return data;
@@ -32,7 +40,8 @@ export default {
'$q', '$q',
'Rest', 'Rest',
'GetBasePath', 'GetBasePath',
function($route, $q, rest, getBasePath) { 'ProcessErrors',
function($route, $q, rest, getBasePath, ProcessErrors) {
if ($route.current.hasModelKey('inventory')) { if ($route.current.hasModelKey('inventory')) {
return $q.when($route.current.params.model.inventory); return $q.when($route.current.params.model.inventory);
} }
@@ -44,7 +53,13 @@ export default {
return rest.get() return rest.get()
.then(function(data) { .then(function(data) {
return data.data; return data.data;
}); }).catch(function (response) {
ProcessErrors(null, response.data, response.status, null, {
hdr: 'Error!',
msg: 'Failed to get license info. GET returned status: ' +
response.status
});
});
} }
], ],
hosts: hosts:
@@ -52,7 +67,8 @@ export default {
'$q', '$q',
'Rest', 'Rest',
'GetBasePath', 'GetBasePath',
function($route, $q, rest, getBasePath) { 'ProcessErrors',
function($route, $q, rest, getBasePath, ProcessErrors) {
if ($route.current.hasModelKey('hosts')) { if ($route.current.hasModelKey('hosts')) {
return $q.when($route.current.params.model.hosts); return $q.when($route.current.params.model.hosts);
} }
@@ -68,7 +84,13 @@ export default {
return rest.get() return rest.get()
.then(function(data) { .then(function(data) {
return data.data; return data.data;
}); }).catch(function (response) {
ProcessErrors(null, response.data, response.status, null, {
hdr: 'Error!',
msg: 'Failed to get license info. GET returned status: ' +
response.status
});
});
}); });
return $q.all(hosts); return $q.all(hosts);