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

Match the orders of the permissions everywhere

Browse Source
This commit is contained in:
Montana 2019-05-06 15:29:07 -04:00
parent 1a2051b2bf
commit 2a9de4f3b9
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,14 +36,14 @@ def team(application_id):
user_name = member.user.full_name user_name = member.user.full_name
environment_users[user_id] = { environment_users[user_id] = {
"permissions": { "permissions": {
"delete_access": permission_str( "team_management": permission_str(
member, PermissionSets.DELETE_APPLICATION_ENVIRONMENTS member, PermissionSets.EDIT_APPLICATION_TEAM
), ),
"environment_management": permission_str( "environment_management": permission_str(
member, PermissionSets.EDIT_APPLICATION_ENVIRONMENTS member, PermissionSets.EDIT_APPLICATION_ENVIRONMENTS
), ),
"team_management": permission_str( "delete_access": permission_str(
member, PermissionSets.EDIT_APPLICATION_TEAM member, PermissionSets.DELETE_APPLICATION_ENVIRONMENTS
), ),
}, },
"environments": Environments.for_user( "environments": Environments.for_user(
@ -51,15 +51,15 @@ def team(application_id):
), ),
} }
permission_sets = { permission_sets = {
"perms_del_env": PermissionSets.DELETE_APPLICATION_ENVIRONMENTS
if member.has_permission_set(PermissionSets.DELETE_APPLICATION_ENVIRONMENTS)
else translate("portfolios.members.permissions.view_only"),
"perms_env_mgmt": PermissionSets.EDIT_APPLICATION_ENVIRONMENTS
if member.has_permission_set(PermissionSets.EDIT_APPLICATION_ENVIRONMENTS)
else translate("portfolios.members.permissions.view_only"),
"perms_team_mgmt": PermissionSets.EDIT_APPLICATION_TEAM "perms_team_mgmt": PermissionSets.EDIT_APPLICATION_TEAM
if member.has_permission_set(PermissionSets.EDIT_APPLICATION_TEAM) if member.has_permission_set(PermissionSets.EDIT_APPLICATION_TEAM)
else translate("portfolios.members.permissions.view_only"), else "View only",
"perms_env_mgmt": PermissionSets.EDIT_APPLICATION_ENVIRONMENTS
if member.has_permission_set(PermissionSets.EDIT_APPLICATION_ENVIRONMENTS)
else "View only",
"perms_del_env": PermissionSets.DELETE_APPLICATION_ENVIRONMENTS
if member.has_permission_set(PermissionSets.DELETE_APPLICATION_ENVIRONMENTS)
else "View only",
} }
roles = EnvironmentRoles.get_for_application_and_user( roles = EnvironmentRoles.get_for_application_and_user(
member.user.id, application.id member.user.id, application.id

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

@ -49,13 +49,13 @@
{{ "common.name" | translate }} {{ "common.name" | translate }}
</div> </div>
<div class="col col--grow"> <div class="col col--grow">
{{ "portfolios.applications.team_settings.section.table.delete_access" | translate }} {{ "portfolios.applications.team_settings.section.table.team_management" | translate }}
</div> </div>
<div class="col col--grow"> <div class="col col--grow">
{{ "portfolios.applications.team_settings.section.table.environment_management" | translate }} {{ "portfolios.applications.team_settings.section.table.environment_management" | translate }}
</div> </div>
<div class="col col--grow"> <div class="col col--grow">
{{ "portfolios.applications.team_settings.section.table.team_management" | translate }} {{ "portfolios.applications.team_settings.section.table.delete_access" | translate }}
</div> </div>
<div class="col col--grow"> <div class="col col--grow">
&nbsp; &nbsp;