From 0d80604fcd15141b65d5c861de4127d5e652d83e Mon Sep 17 00:00:00 2001 From: Montana Date: Mon, 17 Sep 2018 13:41:35 -0400 Subject: [PATCH] Fix bug --- atst/domain/environments.py | 9 ++++----- js/components/forms/edit_workspace_member.js | 9 +-------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/atst/domain/environments.py b/atst/domain/environments.py index 666bb8bd..184eea42 100644 --- a/atst/domain/environments.py +++ b/atst/domain/environments.py @@ -44,6 +44,7 @@ class Environments(object): .all() ) + @classmethod def get(cls, environment_id): try: env = db.session.query(Environment).filter_by(id=environment_id).one() @@ -56,11 +57,9 @@ class Environments(object): def update_environment_role(cls, environment_data, workspace_user): # TODO need to check permissions? new_role = environment_data["user_role_name"] - environment = Environments.get(cls=cls, environment_id=environment_data["id"]) - if workspace_user.has_environment_roles: - env_role = EnvironmentRole.get( - workspace_user.user_id, environment_data["id"] - ) + environment = Environments.get(environment_data["id"]) + env_role = EnvironmentRole.get(member.user_id, environment_data["id"]) + if env_role: env_role.role = new_role else: env_role = EnvironmentRole( diff --git a/js/components/forms/edit_workspace_member.js b/js/components/forms/edit_workspace_member.js index 1c31fb69..73a87c62 100644 --- a/js/components/forms/edit_workspace_member.js +++ b/js/components/forms/edit_workspace_member.js @@ -28,13 +28,6 @@ export default { methods: { change: function (e) { this.value = e.target.value - }, - readableName: function (role) { - return role.replace(/[_]/g, " ") - }, - }, - - mounted: function () { - console.log(this.initialData, this.choices) + } } }