From 54422d74d0b9c782d57b8a06801d9da18ba24bb0 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 31 Jul 2018 13:26:59 -0400 Subject: [PATCH] make credential association cause deferral of jt promise chain --- .../edit-job-template/job-template-edit.controller.js | 4 ++-- .../multi-credential/multi-credential.service.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js index d4ce2a57fb..41528a57d8 100644 --- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js +++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js @@ -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])); } diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.service.js b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.service.js index 50395d9706..e687834645 100644 --- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.service.js +++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential.service.js @@ -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); }); }); });