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

Update content of deletion messages following review

Browse Source
This commit is contained in:
Pea Tyczynska
2018-11-14 17:07:23 +00:00
parent 2a1328a17e
commit f54c2c0dc7
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -408,31 +408,40 @@ def delete_template_folder(service_id, template_folder_id):
form = TemplateFolderForm() form = TemplateFolderForm()
template_folder_path = current_service.get_template_folder_path(template_folder_id) template_folder_path = current_service.get_template_folder_path(template_folder_id)
template_folder_name = template_folder_path[-1]["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("'{}' folder is not empty".format(template_folder_name), 'info') flash("You must empty this folder before you can delete it".format(template_folder_name), 'info')
return redirect(url_for( return redirect(
'.manage_template_folder', service_id, template_folder_id url_for(
)) '.choose_template', service_id=service_id, template_type="all", template_folder_id=template_folder_id
)
)
if request.method == 'POST': if request.method == 'POST':
try: try:
template_folder_api_client.delete_template_folder(current_service.id, template_folder_id) template_folder_api_client.delete_template_folder(current_service.id, template_folder_id)
flash("'{}' folder has been removed".format(template_folder_name), 'info')
return redirect( return redirect(
url_for('.choose_template', service_id=service_id) url_for('.choose_template', service_id=service_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("'{}' folder is not empty".format(template_folder_name), 'info') flash("You must empty this folder before you can delete it".format(template_folder_name), 'info')
return redirect(url_for('.choose_template', service_id=service_id)) return redirect(
url_for(
'.choose_template',
service_id=service_id,
template_type="all",
template_folder_id=template_folder_id
)
)
else: else:
abort(500, e) abort(500, e)
flash("Are you sure you want to remove '{}' folder?".format(template_folder_name), 'remove') 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,