pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move converting the form.permission_sets data from and obj to a list out of the form

Browse Source
This commit is contained in:
leigh-mil 2019-09-13 10:59:34 -04:00
parent 4dab326eef
commit ee0e6c7200
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
atst/forms/application_member.py
View File

@ -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)

17
atst/routes/applications/settings.py
View File

@ -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/<application_id>/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,
)