darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-25 10:29:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Continue to remove "roles" terminology

Browse Source 
This renames the two functions we have to translate between UI and
DB permissions, as well as some of their associated variables to
make it clearer which kind of permission they contain.
This commit is contained in:
Ben Thorner
2021-07-22 14:38:45 +01:00
parent ba9865e62e
commit dcfff87cc0
5 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/user.py
View File

@@ -18,7 +18,7 @@ from app.notify_client.user_api_client import user_api_client
from app.utils.user import is_gov_user
from app.utils.user_permissions import (
all_ui_permissions,
translate_permissions_from_db_to_admin_roles,
translate_permissions_from_db_to_ui,
)
@@ -103,7 +103,7 @@ class User(JSONModel, UserMixin):
them out later, we'll need to rework this function.
"""
self._permissions = {
service: translate_permissions_from_db_to_admin_roles(permissions)
service: translate_permissions_from_db_to_ui(permissions)
for service, permissions
in permissions_by_service.items()
}
@@ -505,7 +505,7 @@ class InvitedUser(JSONModel):
self._permissions = permissions
else:
self._permissions = permissions.split(',')
self._permissions = translate_permissions_from_db_to_admin_roles(self.permissions)
self._permissions = translate_permissions_from_db_to_ui(self.permissions)
@property
def from_user(self):