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

Return all templates for the user if the folder permissions flag is off

Browse Source 
Putting the permission check in the get_user_template_folders allows
us to replace `all_template_folders` usage with the new method without
having to worry about the temporary service permission flag.
This commit is contained in:
Alexey Bezhan
2019-03-06 14:54:53 +00:00
committed by Pea Tyczynska
parent de237e9e6f
commit 1fb7a2515f
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/service.py
View File

@@ -380,6 +380,9 @@ class Service():
return {folder['id'] for folder in self.all_template_folders}
def get_user_template_folders(self, user_id):
if not self.has_permission("edit_folder_permissions"):
return self.all_template_folders
user_folders = []
for folder in self.all_template_folders:
if user_id not in folder.get("users_with_permission", []):

2
tests/app/models/test_service.py
View File

@@ -74,6 +74,7 @@ def test_get_user_template_folders_only_returns_folders_visible_to_user(
mocker
):
mock_get_template_folders.return_value = _get_all_folders(active_user_with_permissions)
service_one['permissions'] = ['edit_folder_permissions']
service = Service(service_one)
result = service.get_user_template_folders(active_user_with_permissions.id)
assert result == [
@@ -117,6 +118,7 @@ def test_get_template_folders_shows_user_folders_when_user_id_passed_in(
mocker
):
mock_get_template_folders.return_value = _get_all_folders(active_user_with_permissions)
service_one['permissions'] = ['edit_folder_permissions']
service = Service(service_one)
result = service.get_template_folders(user_id=active_user_with_permissions.id)
assert result == [