diff --git a/atst/routes/applications/team.py b/atst/routes/applications/team.py index 0b0eefb6..1b14d39f 100644 --- a/atst/routes/applications/team.py +++ b/atst/routes/applications/team.py @@ -170,12 +170,17 @@ def create_member(application_id): @applications_bp.route( - "/applications//members//delete", methods=["POST"] + "/applications//members//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", diff --git a/templates/portfolios/applications/team.html b/templates/portfolios/applications/team.html index a1ef3d57..ac71a3f8 100644 --- a/templates/portfolios/applications/team.html +++ b/templates/portfolios/applications/team.html @@ -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 ) }} diff --git a/tests/routes/applications/test_team.py b/tests/routes/applications/test_team.py index eae6706d..a90bbeae 100644 --- a/tests/routes/applications/test_team.py +++ b/tests/routes/applications/test_team.py @@ -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(), ) )