diff --git a/atst/domain/permission_sets.py b/atst/domain/permission_sets.py index 52131a20..d0d99031 100644 --- a/atst/domain/permission_sets.py +++ b/atst/domain/permission_sets.py @@ -88,6 +88,7 @@ _PORTFOLIO_APP_MGMT_PERMISSION_SETS = [ Permissions.CREATE_APPLICATION, Permissions.DELETE_APPLICATION, Permissions.EDIT_APPLICATION_MEMBER, + Permissions.DELETE_APPLICATION_MEMBER, Permissions.CREATE_APPLICATION_MEMBER, Permissions.EDIT_ENVIRONMENT, Permissions.CREATE_ENVIRONMENT, @@ -205,6 +206,7 @@ _APPLICATION_TEAM_PERMISSION_SET = { "display_name": "Manage team", "permissions": [ Permissions.EDIT_APPLICATION_MEMBER, + Permissions.DELETE_APPLICATION_MEMBER, Permissions.CREATE_APPLICATION_MEMBER, Permissions.ASSIGN_ENVIRONMENT_MEMBER, ], diff --git a/atst/models/permissions.py b/atst/models/permissions.py index 98f25b36..e4b797e4 100644 --- a/atst/models/permissions.py +++ b/atst/models/permissions.py @@ -11,6 +11,7 @@ class Permissions(object): DELETE_APPLICATION = "delete_application" VIEW_APPLICATION_MEMBER = "view_application_member" EDIT_APPLICATION_MEMBER = "edit_application_member" + DELETE_APPLICATION_MEMBER = "delete_application_member" CREATE_APPLICATION_MEMBER = "create_application_member" VIEW_ENVIRONMENT = "view_environment" EDIT_ENVIRONMENT = "edit_environment" diff --git a/atst/routes/applications/team.py b/atst/routes/applications/team.py index ed075023..97783f89 100644 --- a/atst/routes/applications/team.py +++ b/atst/routes/applications/team.py @@ -164,8 +164,7 @@ def create_member(application_id): @applications_bp.route( "/applications//members//delete", methods=["POST"] ) -# TODO: Is this correct?? -@user_can(Permissions.EDIT_APPLICATION_MEMBER, message="remove application member") +@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) diff --git a/templates/fragments/applications/edit_team.html b/templates/fragments/applications/edit_team.html index ea8ac9d0..81baff38 100644 --- a/templates/fragments/applications/edit_team.html +++ b/templates/fragments/applications/edit_team.html @@ -39,7 +39,7 @@ {{ environment_form.environment_name.data }} {% endfor %} - {% if user_can(permissions.EDIT_APPLICATION_MEMBER) %} + {% if user_can(permissions.DELETE_APPLICATION_MEMBER) %}
  • {{ "portfolios.members.archive_button" | translate }} diff --git a/templates/portfolios/applications/team.html b/templates/portfolios/applications/team.html index d0af0b54..7e75e3b9 100644 --- a/templates/portfolios/applications/team.html +++ b/templates/portfolios/applications/team.html @@ -113,7 +113,7 @@ - {% if user_can(permissions.EDIT_APPLICATION_MEMBER) %} + {% if user_can(permissions.DELETE_APPLICATION_MEMBER) %} {% for member_form in team_form.members %} {% set delete_modal_id = "delete-user-{}".format(member_form.id) %} {% call Modal(name=delete_modal_id, dismissable=True) %}