darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-05 01:48:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace "admin roles" with "ui permissions"

Browse Source 
In response to: [1].

While this does introduce a new term ("admin roles" is still used
elsewhere in the code), I plan to fix this in a follow-up PR (it
turned out to be quite a big change to do on this branch).

[1]: https://github.com/alphagov/notifications-admin/pull/3970#discussion_r673292339
This commit is contained in:
Ben Thorner
2021-07-21 16:19:56 +01:00
parent 9fafc092f7
commit 832422fc66
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/event_handlers.py
View File

@@ -7,8 +7,8 @@ EVENT_SCHEMAS = {
"update_user_email": {"user_id", "updated_by_id", "original_email_address", "new_email_address"},
"update_user_mobile_number": {"user_id", "updated_by_id", "original_mobile_number", "new_mobile_number"},
"remove_user_from_service": {"user_id", "removed_by_id", "service_id"},
"add_user_to_service": {"user_id", "invited_by_id", "service_id", "admin_roles"},
"set_user_permissions": {"user_id", "service_id", "original_admin_roles", "new_admin_roles", "set_by_id"},
"add_user_to_service": {"user_id", "invited_by_id", "service_id", "ui_permissions"},
"set_user_permissions": {"user_id", "service_id", "original_ui_permissions", "new_ui_permissions", "set_by_id"},
"archive_user": {"user_id", "archived_by_id"},
"change_broadcast_account_type": {"service_id", "changed_by_id", "service_mode", "broadcast_channel", "provider_restriction"}, # noqa: E501 (length)
"archive_service": {"service_id", "archived_by_id"},

6
app/models/user.py
View File

@@ -135,8 +135,8 @@ class User(JSONModel, UserMixin):
create_set_user_permissions_event(
user_id=self.id,
service_id=service_id,
original_admin_roles=self.permissions_for_service(service_id),
new_admin_roles=permissions,
original_ui_permissions=self.permissions_for_service(service_id),
new_ui_permissions=permissions,
set_by_id=set_by_id,
)
@@ -425,7 +425,7 @@ class User(JSONModel, UserMixin):
user_id=self.id,
invited_by_id=invited_by_id,
service_id=service_id,
admin_roles=permissions,
ui_permissions=permissions,
)
except HTTPError as exception:
if exception.status_code == 400 and 'already part of service' in exception.message: