From 7c596039c5ca73199265f54627034aeb2f22ba53 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Tue, 23 Jan 2018 09:39:59 -0500
Subject: [PATCH 1/3] fix modal exit button close

---
 .../multi-credential/multi-credential-modal.partial.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html
index 93b6a26e67..9662313e7c 100644
--- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html
+++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html
@@ -7,7 +7,7 @@
                 </div>
                 <div class="Form-header--fields"></div>
                 <div class="Form-exitHolder">
-                    <button type="button" class="Form-exit" ng-click="cancelForm()">
+                    <button type="button" class="Form-exit" ng-click="vm.cancelForm()">
                         <i class="fa fa-times-circle"></i>
                     </button>
                 </div>

From 7300c2ccc181fcb88d4c717119a7c469cb54bfc4 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Tue, 23 Jan 2018 10:19:19 -0500
Subject: [PATCH 2/3] fix unexpected deselect when selecting no-vault-id vault
 credentials

---
 .../multi-credential-modal.directive.js              | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
index 5e5baa5a91..0ab5816e70 100644
--- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
+++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
@@ -145,7 +145,7 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService)
 
             if(isReadOnly(credential) && credentialTypeId !== types.Vault) {
                 const index = displayedCredentialTypes
-                    .map(t => t.id).indexOf(credential.credential_type);
+                    .map(t => t.id).indexOf(credentialTypeId);
 
                 if (index > -1) {
                     displayedCredentialTypes.splice(index, 1);
@@ -227,13 +227,17 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService)
             return;
         }
 
-        if (credential.credential_type === types.Vault) {
+        const credentialTypeId = credential.credential_type || credential.credential_type_id;
+
+        if (credentialTypeId === types.Vault) {
+            const vaultId = _.get(credential, 'inputs.vault_id');
+
             scope.modalSelectedCredentials = scope.modalSelectedCredentials
-                .filter(({ inputs }) => inputs.vault_id !== credential.inputs.vault_id)
+                .filter(c => (c.credential_type !== types.Vault) || (c.inputs.vault_id !== vaultId))
                 .concat([credential]);
         } else {
             scope.modalSelectedCredentials = scope.modalSelectedCredentials
-                .filter(({ credential_type }) => credential_type !== credential.credential_type)
+                .filter(({ credential_type }) => credential_type !== credentialTypeId)
                 .concat([credential]);
         }
     };

From cc6465774994737a438a5ee40bded048b397e38e Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Tue, 23 Jan 2018 10:32:13 -0500
Subject: [PATCH 3/3] use correct handle for modal tag deselect

---
 .../multi-credential/multi-credential-modal.directive.js        | 2 +-
 .../multi-credential/multi-credential-modal.partial.html        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
index 0ab5816e70..8a3aa80335 100644
--- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
+++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
@@ -199,7 +199,7 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService)
         scope.modalSelectedCredentials = _.cloneDeep(scope.selectedCredentials);
     };
 
-    vm.removeCredential = id => {
+    vm.removeCredential = ({ id }) => {
         const index = scope.modalSelectedCredentials.map(c => c.id).indexOf(id);
         const isSelected = index > -1;
 
diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html
index 9662313e7c..d53ca59b76 100644
--- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html
+++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html
@@ -23,7 +23,7 @@
                             <div class="MultiCredential-flexContainer">
                                 <div class="MultiCredential-tagContainer ng-scope" ng-repeat="tag in tags track by $index">
                                     <div class="MultiCredential-deleteContainer"
-                                        ng-click="vm.deselectCredential(tag)"
+                                        ng-click="vm.removeCredential(tag)"
                                         ng-hide="fieldIsDisabled || tag.readOnly">
                                         <i class="fa fa-times MultiCredential-tagDelete"></i>
                                     </div>