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

Fix deleting application members from the team page

Browse Source
This commit is contained in:
George Drummond 2019-05-28 15:22:06 -04:00
parent 227feab972
commit 454181665c
No known key found for this signature in database
GPG Key ID: 296DD6077123BF17
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
atst/routes/applications/team.py
View File

@ -170,12 +170,17 @@ def create_member(application_id):
@applications_bp.route(
"/applications/<application_id>/members/<user_id>/delete", methods=["POST"]
"/applications/<application_id>/members/<application_role_id>/delete",
methods=["POST"],
)
@user_can(Permissions.DELETE_APPLICATION_MEMBER, message="remove application member")
def remove_member(application_id, user_id):
Applications.remove_member(application=g.application, user_id=user_id)
user = Users.get(user_id)
def remove_member(application_id, application_role_id):
application_role = ApplicationRoles.get_by_id(application_role_id)
Applications.remove_member(
application=g.application, user_id=application_role.user_id
)
user = Users.get(application_role.user_id)
flash(
"application_member_removed",

2
templates/portfolios/applications/team.html
View File

@ -129,7 +129,7 @@
DeleteConfirmation(
modal_id=delete_modal_id,
delete_text=('portfolios.applications.remove_member.button' | translate),
delete_action=url_for('applications.remove_member', application_id=application.id, user_id=member_form.data.user_id),
delete_action=url_for('applications.remove_member', application_id=application.id, application_role_id=member_form.data.role_id),
form=member_form
)
}}

6
tests/routes/applications/test_team.py
View File

@ -190,7 +190,9 @@ def test_remove_member_success(client, user_session):
response = client.post(
url_for(
"applications.remove_member", application_id=application.id, user_id=user.id
"applications.remove_member",
application_id=application.id,
application_role_id=application_role.id,
)
)
@ -214,7 +216,7 @@ def test_remove_member_failure(client, user_session):
url_for(
"applications.remove_member",
application_id=application.id,
user_id=uuid.uuid4(),
application_role_id=uuid.uuid4(),
)
)