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

Merge pull request #2721 from jlmitch5/fixJTSaveCompletedDeferring

Browse Source 
make credential association cause deferral of jt promise chain
This commit is contained in:
John Mitchell
2018-08-02 09:45:19 -04:00
committed by GitHub
parent a13712074f 54422d74d0
commit 9131577355
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@@ -500,7 +500,7 @@ export default
null, true);
}
MultiCredentialService
var credDefer = MultiCredentialService
.saveRelated(jobTemplateData, $scope.multiCredential.selectedCredentials);
InstanceGroupsService.editInstanceGroups(instance_group_url, $scope.instance_groups)
@@ -580,7 +580,7 @@ export default
Rest.setUrl(data.related.labels);
var defers = [];
var defers = [credDefer];
for (var i = 0; i < toPost.length; i++) {
defers.push(Rest.post(toPost[i]));
}

2
awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.service.js
View File

@@ -40,7 +40,7 @@ function MultiCredentialService (Rest, ProcessErrors, $q, GetBasePath) {
return $q.all(disassociationPromises).then(() => {
_.each(selected.filter(id => currentlyAssociated.indexOf(id) < 0), (id) => {
associate({related}, id);
return associate({related}, id);
});
});
});