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

Remove add folder as a separate page

Browse Source 
This has moved to the choose template page.
This commit is contained in:
Chris Hill-Scott
2019-02-11 16:10:28 +00:00
parent 7d7b790dc1
commit 8512e26d6f
3 changed files with 0 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,28 +393,6 @@ def action_blocked(service_id, notification_type, return_to, template_id):
)
@main.route("/services/<service_id>/templates/add-folder", methods=['GET', 'POST'])
@main.route("/services/<service_id>/templates/folders/<template_folder_id>/add-folder", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_templates')
def add_template_folder(service_id, template_folder_id=None):
form = TemplateFolderForm()
if form.validate_on_submit():
template_folder_api_client.create_template_folder(
current_service.id, name=form.name.data, parent_id=template_folder_id
)
return redirect(
url_for('.choose_template', service_id=service_id, template_folder_id=template_folder_id)
)
return render_template(
'views/templates/add-template-folder.html',
form=form
)
@main.route("/services/<service_id>/templates/folders/<template_folder_id>/manage", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_templates')

4
app/navigation.py
View File

@@ -110,7 +110,6 @@ class HeaderNavigation(Navigation):
'add_data_retention',
'add_service',
'add_service_template',
'add_template_folder',
'agreement',
'api_callbacks',
'api_documentation',
@@ -298,7 +297,6 @@ class MainNavigation(Navigation):
'templates': {
'action_blocked',
'add_service_template',
'add_template_folder',
'check_messages',
'check_notification',
'choose_template',
@@ -551,7 +549,6 @@ class CaseworkNavigation(Navigation):
'add_organisation',
'add_service',
'add_service_template',
'add_template_folder',
'agreement',
'api_callbacks',
'api_documentation',
@@ -786,7 +783,6 @@ class OrgNavigation(Navigation):
'add_organisation',
'add_service',
'add_service_template',
'add_template_folder',
'agreement',
'api_callbacks',
'api_documentation',

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

@@ -37,38 +37,6 @@ def _template(template_type, name, parent=None, template_id=None):
}
@pytest.mark.parametrize('parent_folder_id', [None, PARENT_FOLDER_ID])
def test_get_add_template_folder_page(client_request, service_one, parent_folder_id):
page = client_request.get(
'main.add_template_folder',
service_id=service_one['id'],
template_folder_id=parent_folder_id
)
assert page.select_one('input[name=name]') is not None
@pytest.mark.parametrize('parent_folder_id', [None, PARENT_FOLDER_ID])
def test_post_add_template_folder_page(client_request, service_one, mocker, parent_folder_id):
mock_create = mocker.patch('app.template_folder_api_client.create_template_folder')
client_request.post(
'main.add_template_folder',
service_id=service_one['id'],
template_folder_id=parent_folder_id,
_data={'name': 'foo'},
_expected_redirect=url_for(
'main.choose_template',
service_id=service_one['id'],
template_folder_id=parent_folder_id,
_external=True,
)
)
mock_create.assert_called_once_with(service_one['id'], name='foo', parent_id=parent_folder_id)
@pytest.mark.parametrize(
(
'expected_title_tag,'