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

Remove folders feature flag

Browse Source 
Every service has this feature now[1] so we don’t need to check whether
or not it’s switched on any more.

1. https://github.com/alphagov/notifications-api/pull/2286
This commit is contained in:
Chris Hill-Scott
2019-02-11 16:06:46 +00:00
parent 0c823db970
commit 3a5bfeb7aa
7 changed files with 38 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ def choose_template(service_id, template_type='all', template_folder_id=None):
option_hints = {template_folder_id: 'current folder'}
if request.method == 'POST' and templates_and_folders_form.validate_on_submit():
if not can_manage_folders():
if not current_user.has_permissions('manage_templates'):
abort(403)
try:
return process_folder_management_form(templates_and_folders_form, template_folder_id)
@@ -139,7 +139,6 @@ def choose_template(service_id, template_type='all', template_folder_id=None):
return render_template(
'views/templates/choose.html',
current_template_folder_id=template_folder_id,
can_manage_folders=can_manage_folders(),
template_folder_path=current_service.get_template_folder_path(template_folder_id),
template_list=template_list,
show_search_box=current_service.count_of_templates_and_folders > 7,
@@ -208,13 +207,6 @@ def get_template_nav_items(template_folder_id):
]
def can_manage_folders():
return (
current_service.has_permission('edit_folders') and
current_user.has_permissions('manage_templates')
)
@main.route("/services/<service_id>/templates/<template_id>.<filetype>")
@login_required
@user_has_permissions()
@@ -271,7 +263,6 @@ def add_template_by_type(service_id, template_folder_id=None):
include_copy=(
current_service.all_templates or len(user_api_client.get_service_ids_for_user(current_user)) > 1
),
include_folder=current_service.has_permission('edit_folders')
)
if form.validate_on_submit():
@@ -427,8 +418,6 @@ def action_blocked(service_id, notification_type, return_to, template_id):
@login_required
@user_has_permissions('manage_templates')
def add_template_folder(service_id, template_folder_id=None):
if not current_service.has_permission('edit_folders'):
abort(403)
form = TemplateFolderForm()
@@ -450,8 +439,6 @@ def add_template_folder(service_id, template_folder_id=None):
@login_required
@user_has_permissions('manage_templates')
def manage_template_folder(service_id, template_folder_id):
if not current_service.has_permission('edit_folders'):
abort(403)
form = TemplateFolderForm(
name=current_service.get_template_folder(template_folder_id)['name']
@@ -480,9 +467,6 @@ def manage_template_folder(service_id, template_folder_id):
@user_has_permissions('manage_templates')
def delete_template_folder(service_id, template_folder_id):
if not current_service.has_permission('edit_folders'):
abort(403)
template_folder = current_service.get_template_folder(template_folder_id)
form = TemplateFolderForm(name=template_folder['name'])