darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-10 01:55:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Check if folder is empty before calling the api

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

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

@@ -408,6 +408,14 @@ 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(
template_type="all", template_folder_id=template_folder_id
)) > 0:
flash("'{}' folder is not empty".format(template_folder_name), 'info')
return redirect(url_for(
'.manage_template_folder', service_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)

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

@@ -381,9 +381,13 @@ def test_rename_folder(client_request, service_one, mock_get_template_folders, m
def test_delete_folder(client_request, service_one, mock_get_template_folders, mocker): def test_delete_folder(client_request, service_one, mock_get_template_folders, mocker):
mock_delete = mocker.patch('app.template_folder_api_client.delete_template_folder') mock_delete = mocker.patch('app.template_folder_api_client.delete_template_folder')
folder_id = str(uuid.uuid4()) folder_id = str(uuid.uuid4())
mock_get_template_folders.return_value = [ mock_get_template_folders.side_effect = [[
{'id': folder_id, 'name': 'sacrifice', 'parent_id': None}, {'id': folder_id, 'name': 'sacrifice', 'parent_id': None},
] ], []]
mocker.patch(
'app.models.service.Service.get_templates',
return_value=[],
)
service_one['permissions'] += ['edit_folders'] service_one['permissions'] += ['edit_folders']
client_request.post( client_request.post(