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

Merge pull request #278 from alphagov/revert-201-stub-send-letters

Browse Source 
Revert "Stub out the send letters page"
This commit is contained in:
Chris Hill-Scott
2016-03-16 11:11:31 +00:00
parent 693433e2f8 5ae582f9be
commit 2292ea4d15
4 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/main/views/send.py
View File

@@ -64,13 +64,6 @@ def get_page_headings(template_type):
return manage_templates_page_headings[template_type] return manage_templates_page_headings[template_type]
@main.route("/services/<service_id>/send/letters", methods=['GET'])
def letters_stub(service_id):
return render_template(
'views/letters.html', service_id=service_id
)
@main.route("/services/<service_id>/send/<template_type>", methods=['GET']) @main.route("/services/<service_id>/send/<template_type>", methods=['GET'])
@login_required @login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', or_=True) @user_has_permissions('send_texts', 'send_emails', 'send_letters', 'manage_templates', or_=True)

2
app/templates/main_nav.html
View File

@@ -6,13 +6,11 @@
<ul> <ul>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Send text messages</a></li> <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Send text messages</a></li>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Send emails</a></li> <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Send emails</a></li>
<li><a href="{{ url_for('.letters_stub', service_id=service_id) }}">Send letters</a></li>
</ul> </ul>
{% elif current_user.has_permissions(['manage_templates']) %} {% elif current_user.has_permissions(['manage_templates']) %}
<ul> <ul>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Text message templates</a></li> <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='sms') }}">Text message templates</a></li>
<li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Email templates</a></li> <li><a href="{{ url_for('.choose_template', service_id=service_id, template_type='email') }}">Email templates</a></li>
<li><a href="{{ url_for('.letters_stub', service_id=service_id) }}">Letter templates</a></li>
</ul> </ul>
{% endif %} {% endif %}
{% if current_user.has_permissions(['manage_users', 'manage_settings']) %} {% if current_user.has_permissions(['manage_users', 'manage_settings']) %}

21
app/templates/views/letters.html
View File

@@ -1,21 +0,0 @@
{% extends "withnav_template.html" %}
{% block page_title %}
Send letters – GOV.UK Notify
{% endblock %}
{% block maincolumn_content %}
<h1 class="heading-large">
{% if current_user.has_permissions(['send_letters']) %}
Send letters
{% else %}
Letter templates
{% endif %}
</h1>
<p>
This page is where you would go to send letters.
</p>
{% endblock %}

3
tests/app/main/views/test_dashboard.py
View File

@@ -47,7 +47,6 @@ def test_menu_send_messages(mocker, app_, api_user_active, service_one, mock_get
service_one, service_one,
['send_texts', 'send_emails', 'send_letters']) ['send_texts', 'send_emails', 'send_letters'])
page = resp.get_data(as_text=True) page = resp.get_data(as_text=True)
assert url_for('main.letters_stub', service_id=service_one['id']) in page
assert url_for( assert url_for(
'main.choose_template', 'main.choose_template',
service_id=service_one['id'], 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, service_one,
['manage_users', 'manage_templates', 'manage_settings']) ['manage_users', 'manage_templates', 'manage_settings'])
page = resp.get_data(as_text=True) page = resp.get_data(as_text=True)
assert url_for('main.letters_stub', service_id=service_one['id'])in page
assert url_for( assert url_for(
'main.choose_template', 'main.choose_template',
service_id=service_one['id'], 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, service_one,
['manage_api_keys', 'access_developer_docs']) ['manage_api_keys', 'access_developer_docs'])
page = resp.get_data(as_text=True) page = resp.get_data(as_text=True)
assert url_for('main.letters_stub', service_id=service_one['id']) not in page
assert url_for( assert url_for(
'main.choose_template', 'main.choose_template',
service_id=service_one['id'], service_id=service_one['id'],