From 43a91e8c22568f44b279647eb4ada61075dba879 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 20 Sep 2018 10:53:57 -0400 Subject: [PATCH] Display the environment role nicely --- js/components/forms/edit_workspace_member.js | 22 +++++++++++++------- templates/workspaces/members/edit.html | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/js/components/forms/edit_workspace_member.js b/js/components/forms/edit_workspace_member.js index be3ebc51..00d60a2c 100644 --- a/js/components/forms/edit_workspace_member.js +++ b/js/components/forms/edit_workspace_member.js @@ -24,7 +24,6 @@ export default { data: function () { return { value: this.initialData, - label_class: this.initialData, } }, @@ -32,16 +31,25 @@ export default { change: function (e) { this.value = e.target.value }, - displayName: function (role) { - this.label_class = role === "no_access" ? - "label" : "label label--success" - - return role.replace(/[_]/g, " ") - }, cancel: function (current_role, selected_role) { if (current_role != selected_role) { this.value = current_role } } }, + + computed: { + displayName: function () { + for (var arr in this.choices) { + if (this.choices[arr][0] == this.value) { + return this.choices[arr][1].name + } + } + return this.value + }, + label_class: function () { + return this.value === "no_access" ? + "label" : "label label--success" + } + } } diff --git a/templates/workspaces/members/edit.html b/templates/workspaces/members/edit.html index 78642519..774541cd 100644 --- a/templates/workspaces/members/edit.html +++ b/templates/workspaces/members/edit.html @@ -76,7 +76,7 @@
{{ form.data["environment_role"] }}
- + {% call Modal(name=env.name + 'RolesModal', dismissable=False) %}