Add a delete folder link to manage folder page and basic delete

endpoint
This commit is contained in:
Pea Tyczynska
2018-11-13 15:49:25 +00:00
parent d1805e7fc0
commit 4520065af4
3 changed files with 23 additions and 2 deletions

View File

@@ -390,9 +390,18 @@ def manage_template_folder(service_id, template_folder_id):
'views/templates/manage-template-folder.html',
form=form,
template_folder_path=current_service.get_template_folder_path(template_folder_id),
current_service_id=current_service.id,
template_folder_id=template_folder_id
)
@main.route("/services/<service_id>/templates/folders/<template_folder_id>/delete", methods=['POST'])
def delete_template_folder(service_id, template_folder_id):
if not current_service.has_permission('edit_folders'):
abort(403)
pass
@main.route("/services/<service_id>/templates/add-<template_type>", methods=['GET', 'POST'])
@main.route("/services/<service_id>/templates/folders/<template_folder_id>/add-<template_type>",
methods=['GET', 'POST'])

View File

@@ -25,7 +25,15 @@ Templates
{% call form_wrapper() %}
{{ textbox(form.name) }}
{{ page_footer('Save') }}
{{ page_footer(
'Save',
delete_link=url_for(
'.delete_template_folder',
service_id=current_service_id,
template_folder_id=template_folder_id
),
delete_link_text="Delete this folder") }}
{% endcall %}
{% endblock %}

View File

@@ -324,7 +324,11 @@ def test_get_manage_folder_page(client_request, service_one, mock_get_template_f
service_id=service_one['id'],
template_folder_id=folder_id
)
assert page.select_one('input[name=name]')['value'] == 'folder_two'
assert page.select_one('input[name=name]') is not None
delete_link = page.find('a', string="Delete this folder")
expected_delete_url = "/services/{}/templates/folders/{}/delete".format(service_one['id'], folder_id)
assert expected_delete_url in delete_link["href"]
def test_manage_folder_page_404s(client_request, service_one, mock_get_template_folders):