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

Merge pull request #2775 from jlmitch5/fixInstanceGroups404

Browse Source 
Fix instance groups 404
This commit is contained in:
John Mitchell
2018-08-07 12:58:55 -04:00
committed by GitHub
parent c4d9b92d79 768d737153
commit d7a9d76d25
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/ui/client/src/instance-groups/main.js
View File

@@ -27,7 +27,7 @@ import instanceJobsRoute from '~features/jobs/routes/instanceJobs.route.js';
const MODULE_NAME = 'instanceGroups'; const MODULE_NAME = 'instanceGroups';
function InstanceGroupsResolve ($q, $stateParams, InstanceGroup, Instance) { function InstanceGroupsResolve ($q, $stateParams, InstanceGroup, Instance, ProcessErrors, strings) {
const instanceGroupId = $stateParams.instance_group_id; const instanceGroupId = $stateParams.instance_group_id;
const instanceId = $stateParams.instance_id; const instanceId = $stateParams.instance_id;
let promises = {}; let promises = {};
@@ -48,14 +48,23 @@ function InstanceGroupsResolve ($q, $stateParams, InstanceGroup, Instance) {
.then((instanceGroup) => instanceGroup.extend('get', 'instances')); .then((instanceGroup) => instanceGroup.extend('get', 'instances'));
return $q.all(promises) return $q.all(promises)
.then(models => models); .then(models => models)
.catch(({ data, status, config }) => {
ProcessErrors(null, data, status, null, {
hdr: strings.get('error.HEADER'),
msg: strings.get('error.CALL', { path: `${config.url}`, status })
});
return $q.reject();
});
} }
InstanceGroupsResolve.$inject = [ InstanceGroupsResolve.$inject = [
'$q', '$q',
'$stateParams', '$stateParams',
'InstanceGroupModel', 'InstanceGroupModel',
'InstanceModel' 'InstanceModel',
'ProcessErrors',
'InstanceGroupsStrings'
]; ];
function InstanceGroupsRun ($stateExtender, strings) { function InstanceGroupsRun ($stateExtender, strings) {