darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 18:37:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor how we get template folder on delete page

Browse Source 
It’s a bit obtuse to look it up from the `template_folder_path`,
especially now that we have a specific method on the model that does
the exact thing.
This commit is contained in:
Chris Hill-Scott
2018-11-20 11:31:31 +00:00
parent 13a962b6bd
commit 4bccce4772
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main/views/templates.py
+9 -9
View File
@@ -404,18 +404,18 @@ def manage_template_folder(service_id, template_folder_id):
@login_required @login_required
@user_has_permissions('manage_templates') @user_has_permissions('manage_templates')
def delete_template_folder(service_id, template_folder_id): def delete_template_folder(service_id, template_folder_id):
if not current_service.has_permission('edit_folders'): if not current_service.has_permission('edit_folders'):
abort(403) abort(403)
form = TemplateFolderForm(
name=current_service.get_template_folder(template_folder_id)['name'] template_folder = current_service.get_template_folder(template_folder_id)
)
template_folder_path = current_service.get_template_folder_path(template_folder_id) form = TemplateFolderForm(name=template_folder['name'])
template_folder_name = template_folder_path[-1]["name"]
if len(current_service.get_template_folders_and_templates( if len(current_service.get_template_folders_and_templates(
template_type="all", template_folder_id=template_folder_id template_type="all", template_folder_id=template_folder_id
)) > 0: )) > 0:
flash("You must empty this folder before you can delete it".format(template_folder_name), 'info') flash("You must empty this folder before you can delete it".format(template_folder['name']), 'info')
return redirect( return redirect(
url_for( url_for(
'.choose_template', service_id=service_id, template_type="all", template_folder_id=template_folder_id '.choose_template', service_id=service_id, template_type="all", template_folder_id=template_folder_id
@@ -432,7 +432,7 @@ def delete_template_folder(service_id, template_folder_id):
except HTTPError as e: except HTTPError as e:
msg = "Folder is not empty" msg = "Folder is not empty"
if e.status_code == 400 and msg in e.message: if e.status_code == 400 and msg in e.message:
flash("You must empty this folder before you can delete it".format(template_folder_name), 'info') flash("You must empty this folder before you can delete it", 'info')
return redirect( return redirect(
url_for( url_for(
'.choose_template', '.choose_template',
@@ -444,11 +444,11 @@ def delete_template_folder(service_id, template_folder_id):
else: else:
abort(500, e) abort(500, e)
flash("Are you sure you want to delete the ‘{}’ folder?".format(template_folder_name), 'delete') flash("Are you sure you want to delete the ‘{}’ folder?".format(template_folder['name']), 'delete')
return render_template( return render_template(
'views/templates/manage-template-folder.html', 'views/templates/manage-template-folder.html',
form=form, form=form,
template_folder_path=template_folder_path, template_folder_path=current_service.get_template_folder_path(template_folder_id),
current_service_id=current_service.id, current_service_id=current_service.id,
template_folder_id=template_folder_id, template_folder_id=template_folder_id,
template_type="all", template_type="all",