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

Remove separation between upload and send

Browse Source 
Now that you can access upload from within the send one off message
flow, it doesn’t need its own linkbutton on the template page.
This commit is contained in:
Chris Hill-Scott
2018-07-18 09:56:21 +01:00
parent 3bd62c2aef
commit bcf538fa10
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/templates/views/templates/_template.html
View File

@@ -14,27 +14,34 @@
{% else %} {% else %}
<div class="bottom-gutter-2-3"> <div class="bottom-gutter-2-3">
<div class="grid-row"> <div class="grid-row">
{% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %} {% if template.template_type == 'letter' %}
<div class="{{ 'column-half' if template.template_type == 'letter' else 'column-third' }}"> {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
<a href="{{ url_for(".send_messages", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item"> <div class="column-half">
Upload recipients <a href="{{ url_for(".send_messages", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
</a> Upload recipients
</div> </a>
<div class="{{ 'column-half' if template.template_type == 'letter' else 'column-third' }}"> </div>
<a href="{{ url_for(".set_sender", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item"> <div class="column-half">
{{ 'Print a test letter' if template.template_type == 'letter' else 'Send to one recipient' }} <a href="{{ url_for(".set_sender", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
</a> Print a test letter
</div> </a>
{% endif %} </div>
{% if {% endif %}
current_user.has_permissions('manage_templates') and {% else %}
template.template_type != 'letter' {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
%} <div class="column-half">
<div class="column-one-third"> <a href="{{ url_for(".set_sender", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
<a href="{{ url_for(".edit_service_template", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item"> Send
Edit template </a>
</a> </div>
</div> {% endif %}
{% if current_user.has_permissions('manage_templates') %}
<div class="column-half">
<a href="{{ url_for(".edit_service_template", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
Edit
</a>
</div>
{% endif %}
{% endif %} {% endif %}
</div> </div>
</div> </div>

4
tests/app/main/views/test_templates.py
View File

@@ -205,12 +205,12 @@ def test_caseworker_redirected_to_one_off(
), ),
( (
['send_messages'], ['send_messages'],
['.send_messages', '.set_sender'], ['.set_sender'],
None, None,
), ),
( (
['send_messages', 'manage_templates'], ['send_messages', 'manage_templates'],
['.send_messages', '.set_sender', '.edit_service_template'], ['.set_sender', '.edit_service_template'],
None, None,
), ),
]) ])