From 6d50c228afa0193ab47729cb9298d73efc96ae55 Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Fri, 21 Sep 2018 10:55:41 -0400
Subject: [PATCH] Fix bug that would save a user's modal selection even if the
 user canceled out of the modal

---
 js/components/forms/edit_workspace_member.js | 8 +++-----
 templates/workspaces/members/edit.html       | 5 +++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/js/components/forms/edit_workspace_member.js b/js/components/forms/edit_workspace_member.js
index 37cf00bb..2a5c5e2a 100644
--- a/js/components/forms/edit_workspace_member.js
+++ b/js/components/forms/edit_workspace_member.js
@@ -32,10 +32,8 @@ export default {
       e.preventDefault()
       this.new_role = e.target.value
     },
-    cancel: function (current_role, selected_role) {
-      if (current_role != selected_role) {
-        this.new_role = current_role
-      }
+    cancel: function () {
+      this.new_role = this.initialData
     },
   },
 
@@ -51,6 +49,6 @@ export default {
     label_class: function () {
       return this.displayName === "no access" ?
         "label" : "label label--success"
-    }
+    },
   }
 }
diff --git a/templates/workspaces/members/edit.html b/templates/workspaces/members/edit.html
index 44eac364..31252b1e 100644
--- a/templates/workspaces/members/edit.html
+++ b/templates/workspaces/members/edit.html
@@ -86,7 +86,7 @@
 
                         {% if choice[0] != ""  %}
                           <input
-                            name='env_{{ env.id }}'
+                            name='radio_input_{{ env.id }}'
                             v-on:change='change'
                             type='radio'
                             id="env_{{ env.id }}_{{ choice[0] }}"
@@ -109,10 +109,11 @@
                       </li>
                       {% endfor %}
                     </ul>
+                    <input type='hidden' name='env_{{ env.id }}' v-bind:value='new_role'/>
                     <div class='block-list__footer'>
                       <div class='action-group'>
                         <a v-on:click="closeModal('{{ env.name }}RolesModal')" class='action-group__action usa-button'>Select Access Role</a>
-                        <a class='action-group__action icon-link icon-link--danger' v-on:click="closeModal('{{ env.name }}RolesModal'); cancel('{{ role }}', value);" value="{{ value if value == role else role }}" >Cancel</a>
+                        <a class='action-group__action icon-link icon-link--danger' v-on:click="closeModal('{{ env.name }}RolesModal'); cancel();" value="{{ value if value == role else role }}" >Cancel</a>
                       </div>
                     </div>
                   </div>