Fix bug that would save a user's modal selection even if the user canceled out of the modal

This commit is contained in:
Montana 2018-09-21 10:55:41 -04:00
parent a071ff625f
commit 6d50c228af
2 changed files with 6 additions and 7 deletions

View File

@ -32,10 +32,8 @@ export default {
e.preventDefault() e.preventDefault()
this.new_role = e.target.value this.new_role = e.target.value
}, },
cancel: function (current_role, selected_role) { cancel: function () {
if (current_role != selected_role) { this.new_role = this.initialData
this.new_role = current_role
}
}, },
}, },
@ -51,6 +49,6 @@ export default {
label_class: function () { label_class: function () {
return this.displayName === "no access" ? return this.displayName === "no access" ?
"label" : "label label--success" "label" : "label label--success"
} },
} }
} }

View File

@ -86,7 +86,7 @@
{% if choice[0] != "" %} {% if choice[0] != "" %}
<input <input
name='env_{{ env.id }}' name='radio_input_{{ env.id }}'
v-on:change='change' v-on:change='change'
type='radio' type='radio'
id="env_{{ env.id }}_{{ choice[0] }}" id="env_{{ env.id }}_{{ choice[0] }}"
@ -109,10 +109,11 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
<input type='hidden' name='env_{{ env.id }}' v-bind:value='new_role'/>
<div class='block-list__footer'> <div class='block-list__footer'>
<div class='action-group'> <div class='action-group'>
<a v-on:click="closeModal('{{ env.name }}RolesModal')" class='action-group__action usa-button'>Select Access Role</a> <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> </div>
</div> </div>