From 9827c838793d6df2686ff853211b3e17c4b86425 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 15 Mar 2016 08:33:51 +0000 Subject: [PATCH 1/2] Revert "Stub out the send letters page" Reverts alphagov/notifications-admin#201 --- app/main/views/send.py | 7 ------- app/templates/main_nav.html | 1 - app/templates/views/letters.html | 21 --------------------- 3 files changed, 29 deletions(-) delete mode 100644 app/templates/views/letters.html diff --git a/app/main/views/send.py b/app/main/views/send.py index 72ee60a8c..4fa3ec0e0 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -63,13 +63,6 @@ def get_page_headings(template_type): return manage_templates_page_headings[template_type] -@main.route("/services//send/letters", methods=['GET']) -def letters_stub(service_id): - return render_template( - 'views/letters.html', service_id=service_id - ) - - @main.route("/services//send/", methods=['GET']) @login_required @user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', or_=True) diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index bafcfae2e..f1be21634 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -12,7 +12,6 @@ {% endif %} {% if current_user.has_permissions(['manage_users', 'manage_settings']) %} diff --git a/app/templates/views/letters.html b/app/templates/views/letters.html deleted file mode 100644 index 5ef3e4d6f..000000000 --- a/app/templates/views/letters.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "withnav_template.html" %} - -{% block page_title %} - Send letters – GOV.UK Notify -{% endblock %} - -{% block maincolumn_content %} - -

- {% if current_user.has_permissions(['send_letters']) %} - Send letters - {% else %} - Letter templates - {% endif %} -

- -

- This page is where you would go to send letters. -

- -{% endblock %} From 5ae582f9be58e96b9e18f85dbd8a492f8dc0c093 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Tue, 15 Mar 2016 12:02:03 +0000 Subject: [PATCH 2/2] Remove reference to deleted endpoint --- app/templates/main_nav.html | 1 - tests/app/main/views/test_dashboard.py | 3 --- 2 files changed, 4 deletions(-) diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index f1be21634..96c1c372b 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -6,7 +6,6 @@ {% elif current_user.has_permissions(['manage_templates']) %}
    diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 4fb92a2b5..0902f6293 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -47,7 +47,6 @@ def test_menu_send_messages(mocker, app_, api_user_active, service_one, mock_get service_one, ['send_texts', 'send_emails', 'send_letters']) page = resp.get_data(as_text=True) - assert url_for('main.letters_stub', service_id=service_one['id']) in page assert url_for( 'main.choose_template', service_id=service_one['id'], @@ -73,7 +72,6 @@ def test_menu_manage_service(mocker, app_, api_user_active, service_one, mock_ge service_one, ['manage_users', 'manage_templates', 'manage_settings']) page = resp.get_data(as_text=True) - assert url_for('main.letters_stub', service_id=service_one['id'])in page assert url_for( 'main.choose_template', service_id=service_one['id'], @@ -99,7 +97,6 @@ def test_menu_manage_api_keys(mocker, app_, api_user_active, service_one, mock_g service_one, ['manage_api_keys', 'access_developer_docs']) page = resp.get_data(as_text=True) - assert url_for('main.letters_stub', service_id=service_one['id']) not in page assert url_for( 'main.choose_template', service_id=service_one['id'],