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

Remove edit_folder_permissions service setting (feature flag)

Browse Source 
This removes the edit_folder_permission checks from the code, enabling
the folder permissions for all services.

This also fixes folder-related tests to set up appropriate user
permissions.

This should only be merged right after alphagov/notifications-api#2428,
when all other permission stories are done.
This commit is contained in:
Alexey Bezhan
2019-04-02 15:23:46 +01:00
committed by Chris Hill-Scott
parent c31dbd4de0
commit cab780b549
14 changed files with 48 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/service.py
View File

@@ -154,7 +154,7 @@ class Service(JSONModel):
return {template['id'] for template in self.all_templates}
def get_templates(self, template_type='all', template_folder_id=None, user=None):
if user and template_folder_id and self.has_permission('edit_folder_permissions'):
if user and template_folder_id:
folder = self.get_template_folder(template_folder_id)
if not user.has_template_folder_permission(folder):
return []
@@ -175,9 +175,6 @@ class Service(JSONModel):
def get_template_folder_with_user_permission_or_403(self, folder_id, user):
template_folder = self.get_template_folder(folder_id)
if not self.has_permission("edit_folder_permissions"):
return template_folder
if not user.has_template_folder_permission(template_folder):
abort(403)
@@ -438,9 +435,6 @@ class Service(JSONModel):
folder making sure it displays in the closest visible parent.
"""
if not self.has_permission("edit_folder_permissions"):
return self.all_template_folders
user_folders = []
for folder in self.all_template_folders:
if not user.has_template_folder_permission(folder, service=self):

8
app/models/user.py
View File

@@ -155,14 +155,6 @@ class User(UserMixin):
return permission in self._permissions.get(service_id, [])
def has_template_folder_permission(self, template_folder, service=None):
from app import current_service
if service is None:
service = current_service
if not service.has_permission('edit_folder_permissions'):
return True
if self.platform_admin:
return True