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

Add DELETE_APPLICATION_MEMBER permission

Browse Source
This commit is contained in:
George Drummond 2019-05-14 13:39:20 -04:00
parent 4aea264026
commit f1299dc4b0
No known key found for this signature in database
GPG Key ID: 296DD6077123BF17
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/domain/permission_sets.py
View File

@ -88,6 +88,7 @@ _PORTFOLIO_APP_MGMT_PERMISSION_SETS = [
Permissions.CREATE_APPLICATION, Permissions.CREATE_APPLICATION,
Permissions.DELETE_APPLICATION, Permissions.DELETE_APPLICATION,
Permissions.EDIT_APPLICATION_MEMBER, Permissions.EDIT_APPLICATION_MEMBER,
Permissions.DELETE_APPLICATION_MEMBER,
Permissions.CREATE_APPLICATION_MEMBER, Permissions.CREATE_APPLICATION_MEMBER,
Permissions.EDIT_ENVIRONMENT, Permissions.EDIT_ENVIRONMENT,
Permissions.CREATE_ENVIRONMENT, Permissions.CREATE_ENVIRONMENT,
@ -205,6 +206,7 @@ _APPLICATION_TEAM_PERMISSION_SET = {
"display_name": "Manage team", "display_name": "Manage team",
"permissions": [ "permissions": [
Permissions.EDIT_APPLICATION_MEMBER, Permissions.EDIT_APPLICATION_MEMBER,
Permissions.DELETE_APPLICATION_MEMBER,
Permissions.CREATE_APPLICATION_MEMBER, Permissions.CREATE_APPLICATION_MEMBER,
Permissions.ASSIGN_ENVIRONMENT_MEMBER, Permissions.ASSIGN_ENVIRONMENT_MEMBER,
], ],

1
atst/models/permissions.py
View File

@ -11,6 +11,7 @@ class Permissions(object):
DELETE_APPLICATION = "delete_application" DELETE_APPLICATION = "delete_application"
VIEW_APPLICATION_MEMBER = "view_application_member" VIEW_APPLICATION_MEMBER = "view_application_member"
EDIT_APPLICATION_MEMBER = "edit_application_member" EDIT_APPLICATION_MEMBER = "edit_application_member"
DELETE_APPLICATION_MEMBER = "delete_application_member"
CREATE_APPLICATION_MEMBER = "create_application_member" CREATE_APPLICATION_MEMBER = "create_application_member"
VIEW_ENVIRONMENT = "view_environment" VIEW_ENVIRONMENT = "view_environment"
EDIT_ENVIRONMENT = "edit_environment" EDIT_ENVIRONMENT = "edit_environment"

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

@ -164,8 +164,7 @@ def create_member(application_id):
@applications_bp.route( @applications_bp.route(
"/applications/<application_id>/members/<user_id>/delete", methods=["POST"] "/applications/<application_id>/members/<user_id>/delete", methods=["POST"]
) )
# TODO: Is this correct?? @user_can(Permissions.DELETE_APPLICATION_MEMBER, message="remove application member")
@user_can(Permissions.EDIT_APPLICATION_MEMBER, message="remove application member")
def remove_member(application_id, user_id): def remove_member(application_id, user_id):
Applications.remove_member(application=g.application, user_id=user_id) Applications.remove_member(application=g.application, user_id=user_id)
user = Users.get(user_id) user = Users.get(user_id)

2
templates/fragments/applications/edit_team.html
View File

@ -39,7 +39,7 @@
{{ environment_form.environment_name.data }} {{ environment_form.environment_name.data }}
</li> </li>
{% endfor %} {% endfor %}
{% if user_can(permissions.EDIT_APPLICATION_MEMBER) %} {% if user_can(permissions.DELETE_APPLICATION_MEMBER) %}
<li class="accordion-table__item__expanded action-group"> <li class="accordion-table__item__expanded action-group">
<span class="usa-button button-danger" v-on:click="openModal('{{ delete_modal_id }}')"> <span class="usa-button button-danger" v-on:click="openModal('{{ delete_modal_id }}')">
{{ "portfolios.members.archive_button" | translate }} {{ "portfolios.members.archive_button" | translate }}

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

@ -113,7 +113,7 @@
</form> </form>
</base-form> </base-form>
{% if user_can(permissions.EDIT_APPLICATION_MEMBER) %} {% if user_can(permissions.DELETE_APPLICATION_MEMBER) %}
{% for member_form in team_form.members %} {% for member_form in team_form.members %}
{% set delete_modal_id = "delete-user-{}".format(member_form.id) %} {% set delete_modal_id = "delete-user-{}".format(member_form.id) %}
{% call Modal(name=delete_modal_id, dismissable=True) %} {% call Modal(name=delete_modal_id, dismissable=True) %}