mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-11 10:28:41 -04:00
Return all templates for the user if the folder permissions flag is off
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:
@@ -380,6 +380,9 @@ class Service():
|
|||||||
return {folder['id'] for folder in self.all_template_folders}
|
return {folder['id'] for folder in self.all_template_folders}
|
||||||
|
|
||||||
def get_user_template_folders(self, user_id):
|
def get_user_template_folders(self, user_id):
|
||||||
|
if not self.has_permission("edit_folder_permissions"):
|
||||||
|
return self.all_template_folders
|
||||||
|
|
||||||
user_folders = []
|
user_folders = []
|
||||||
for folder in self.all_template_folders:
|
for folder in self.all_template_folders:
|
||||||
if user_id not in folder.get("users_with_permission", []):
|
if user_id not in folder.get("users_with_permission", []):
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ def test_get_user_template_folders_only_returns_folders_visible_to_user(
|
|||||||
mocker
|
mocker
|
||||||
):
|
):
|
||||||
mock_get_template_folders.return_value = _get_all_folders(active_user_with_permissions)
|
mock_get_template_folders.return_value = _get_all_folders(active_user_with_permissions)
|
||||||
|
service_one['permissions'] = ['edit_folder_permissions']
|
||||||
service = Service(service_one)
|
service = Service(service_one)
|
||||||
result = service.get_user_template_folders(active_user_with_permissions.id)
|
result = service.get_user_template_folders(active_user_with_permissions.id)
|
||||||
assert result == [
|
assert result == [
|
||||||
@@ -117,6 +118,7 @@ def test_get_template_folders_shows_user_folders_when_user_id_passed_in(
|
|||||||
mocker
|
mocker
|
||||||
):
|
):
|
||||||
mock_get_template_folders.return_value = _get_all_folders(active_user_with_permissions)
|
mock_get_template_folders.return_value = _get_all_folders(active_user_with_permissions)
|
||||||
|
service_one['permissions'] = ['edit_folder_permissions']
|
||||||
service = Service(service_one)
|
service = Service(service_one)
|
||||||
result = service.get_template_folders(user_id=active_user_with_permissions.id)
|
result = service.get_template_folders(user_id=active_user_with_permissions.id)
|
||||||
assert result == [
|
assert result == [
|
||||||
|
|||||||
Reference in New Issue
Block a user