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

Add flash messages and error handling to delete folder flow

Browse Source
This commit is contained in:
Pea Tyczynska
2018-11-14 12:16:57 +00:00
parent 91d309816b
commit d61022e3e6
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,11 +406,31 @@ def delete_template_folder(service_id, template_folder_id):
if not current_service.has_permission('edit_folders'):
abort(403)
form = TemplateFolderForm()
template_folder_path = current_service.get_template_folder_path(template_folder_id)
template_folder_name = template_folder_path[-1]["name"]
if request.method == 'POST':
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(
url_for('.choose_template', service_id=service_id)
)
except HTTPError as e:
msg = "Folder is not empty"
if e.status_code == 400 and msg in e.message:
flash("'{}' folder is not empty".format(template_folder_name), 'info')
return redirect(url_for('.choose_template', service_id=service_id))
else:
abort(500, e)
return redirect(
url_for('.choose_template', service_id=service_id)
flash("Are you sure you want to remove '{}' folder?".format(template_folder_name), 'remove')
return render_template(
'views/templates/manage-template-folder.html',
form=form,
template_folder_path=template_folder_path,
current_service_id=current_service.id,
template_folder_id=template_folder_id
)

2
tests/app/main/views/test_template_folders.py
View File

@@ -382,7 +382,7 @@ def test_delete_folder(client_request, service_one, mock_get_template_folders, m
mock_delete = mocker.patch('app.template_folder_api_client.delete_template_folder')
folder_id = str(uuid.uuid4())
mock_get_template_folders.return_value = [
{'id': folder_id, 'name': 'folder_two', 'parent_id': None},
{'id': folder_id, 'name': 'sacrifice', 'parent_id': None},
]
service_one['permissions'] += ['edit_folders']