From ee0e6c7200bc1cb8c76d360096493b082fcd0fc5 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 13 Sep 2019 10:59:34 -0400 Subject: [PATCH] Move converting the form.permission_sets data from and obj to a list out of the form --- atst/forms/application_member.py | 16 ---------------- atst/routes/applications/settings.py | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/atst/forms/application_member.py b/atst/forms/application_member.py index 26b8da6c..30af4097 100644 --- a/atst/forms/application_member.py +++ b/atst/forms/application_member.py @@ -51,22 +51,6 @@ class PermissionsForm(Form): ), ) - @property - def data(self): - _data = super().data - perm_sets = [] - - if _data["perms_env_mgmt"]: - perm_sets.append(PermissionSets.EDIT_APPLICATION_ENVIRONMENTS) - - if _data["perms_team_mgmt"]: - perm_sets.append(PermissionSets.EDIT_APPLICATION_TEAM) - - if _data["perms_del_env"]: - perm_sets.append(PermissionSets.DELETE_APPLICATION_ENVIRONMENTS) - - return perm_sets - class NewForm(BaseForm): user_data = FormField(BaseNewMemberForm) diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py index 3664d336..399a2d89 100644 --- a/atst/routes/applications/settings.py +++ b/atst/routes/applications/settings.py @@ -131,6 +131,21 @@ def send_application_invitation(invitee_email, inviter_name, token): ) +def perm_sets_obj_to_list(perms_obj): + perm_sets = [] + + if perms_obj["perms_env_mgmt"]: + perm_sets.append(PermissionSets.EDIT_APPLICATION_ENVIRONMENTS) + + if perms_obj["perms_team_mgmt"]: + perm_sets.append(PermissionSets.EDIT_APPLICATION_TEAM) + + if perms_obj["perms_del_env"]: + perm_sets.append(PermissionSets.DELETE_APPLICATION_ENVIRONMENTS) + + return perm_sets + + @applications_bp.route("/applications//settings") @user_can(Permissions.VIEW_APPLICATION, message="view application edit form") def settings(application_id): @@ -270,7 +285,7 @@ def create_member(application_id): application=application, inviter=g.current_user, user_data=form.user_data.data, - permission_sets_names=form.permission_sets.data, + permission_sets_names=perm_sets_obj_to_list(form.permission_sets.data), environment_roles_data=form.environment_roles.data, )