From 2a9de4f3b9f089056c02bb8e2fed3838f9bd94c4 Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Mon, 6 May 2019 15:29:07 -0400
Subject: [PATCH] Match the orders of the permissions everywhere

---
 atst/routes/applications/team.py            | 22 ++++++++++-----------
 templates/portfolios/applications/team.html |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/atst/routes/applications/team.py b/atst/routes/applications/team.py
index 99f4a27e..056b5d38 100644
--- a/atst/routes/applications/team.py
+++ b/atst/routes/applications/team.py
@@ -36,14 +36,14 @@ def team(application_id):
         user_name = member.user.full_name
         environment_users[user_id] = {
             "permissions": {
-                "delete_access": permission_str(
-                    member, PermissionSets.DELETE_APPLICATION_ENVIRONMENTS
+                "team_management": permission_str(
+                    member, PermissionSets.EDIT_APPLICATION_TEAM
                 ),
                 "environment_management": permission_str(
                     member, PermissionSets.EDIT_APPLICATION_ENVIRONMENTS
                 ),
-                "team_management": permission_str(
-                    member, PermissionSets.EDIT_APPLICATION_TEAM
+                "delete_access": permission_str(
+                    member, PermissionSets.DELETE_APPLICATION_ENVIRONMENTS
                 ),
             },
             "environments": Environments.for_user(
@@ -51,15 +51,15 @@ def team(application_id):
             ),
         }
         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
             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(
             member.user.id, application.id
diff --git a/templates/portfolios/applications/team.html b/templates/portfolios/applications/team.html
index b80b070f..ed79d259 100644
--- a/templates/portfolios/applications/team.html
+++ b/templates/portfolios/applications/team.html
@@ -49,13 +49,13 @@
                 {{ "common.name" | translate }}
               </div>
               <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 class="col col--grow">
                 {{ "portfolios.applications.team_settings.section.table.environment_management" | translate }}
               </div>
               <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 class="col col--grow">
                 &nbsp;