darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 08:09:49 -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

15
app/main/views/templates.py
View File

@@ -53,10 +53,7 @@ def view_template(service_id, template_id):
template = current_service.get_template(template_id)
template_folder = current_service.get_template_folder(template['folder'])
if not current_service.has_permission("edit_folder_permissions"):
user_has_template_permission = True
else:
user_has_template_permission = current_user.has_template_folder_permission(template_folder)
user_has_template_permission = current_user.has_template_folder_permission(template_folder)
if should_skip_template_page(template['template_type']):
return redirect(url_for(
@@ -120,10 +117,7 @@ def start_tour(service_id, template_id):
def choose_template(service_id, template_type='all', template_folder_id=None):
template_folder = current_service.get_template_folder(template_folder_id)
if not current_service.has_permission("edit_folder_permissions"):
user_has_template_folder_permission = True
else:
user_has_template_folder_permission = current_user.has_template_folder_permission(template_folder)
user_has_template_folder_permission = current_user.has_template_folder_permission(template_folder)
template_list = TemplateList(current_service, template_type, template_folder_id, current_user)
@@ -393,10 +387,7 @@ def copy_template(service_id, template_id):
template = service_api_client.get_service_template(from_service, str(template_id))['data']
template_folder = template_folder_api_client.get_template_folder(from_service, template['folder'])
if (
current_service.has_permission('edit_folder_permissions') and
not current_user.has_template_folder_permission(template_folder)
):
if not current_user.has_template_folder_permission(template_folder):
abort(403)
if request.method == 'POST':