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

Don't use service default postage, but template postage instead

Browse Source
This commit is contained in:
Pea Tyczynska
2019-02-04 17:28:14 +00:00
parent 64aff0ba05
commit b07f16b9a0
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/jobs.py
View File

@@ -390,7 +390,7 @@ def get_job_partials(job, template):
if notifications['notifications']: if notifications['notifications']:
postage = notifications['notifications'][0]['postage'] postage = notifications['notifications'][0]['postage']
else: else:
postage = current_service.postage postage = template['postage']
counts = render_template( counts = render_template(
'partials/jobs/count-letters.html', 'partials/jobs/count-letters.html',

1
app/notify_client/service_api_client.py
View File

@@ -83,7 +83,6 @@ class ServiceAPIClient(NotifyAdminAPIClient):
'free_sms_fragment_limit', 'free_sms_fragment_limit',
'prefix_sms', 'prefix_sms',
'contact_link', 'contact_link',
'postage',
} }
if disallowed_attributes: if disallowed_attributes:
raise TypeError('Not allowed to update service attributes: {}'.format( raise TypeError('Not allowed to update service attributes: {}'.format(

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

@@ -22,12 +22,10 @@
</a> </a>
</div> </div>
{% endif %} {% endif %}
{% if current_service.has_permission("choose_postage") %}
<div class="column-whole" id="postage"> <div class="column-whole" id="postage">
<h2 class="heading-small heading-inline">Postage</h2>: <h2 class="heading-small heading-inline">Postage</h2>:
{{ template_postage or current_service.postage }} class {{ template_postage or current_service.postage }} class
</div> </div>
{% endif %}
{% else %} {% else %}
{% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %} {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
<div class="column-half"> <div class="column-half">

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

@@ -11,6 +11,7 @@ from tests.conftest import (
active_caseworking_user, active_caseworking_user,
active_user_with_permissions, active_user_with_permissions,
mock_get_notifications, mock_get_notifications,
mock_get_service_letter_template,
normalize_spaces, normalize_spaces,
) )
@@ -553,7 +554,6 @@ def test_should_show_letter_job_with_first_class_if_notifications_are_first_clas
def test_should_show_letter_job_with_first_class_if_no_notifications( def test_should_show_letter_job_with_first_class_if_no_notifications(
client_request, client_request,
service_one, service_one,
mock_get_service_letter_template,
mock_get_job, mock_get_job,
fake_uuid, fake_uuid,
mock_get_notifications_with_no_notifications, mock_get_notifications_with_no_notifications,
@@ -561,7 +561,7 @@ def test_should_show_letter_job_with_first_class_if_no_notifications(
mocker mocker
): ):
service_one['postage'] = 'first' mock_get_service_letter_template(mocker, postage="first")
page = client_request.get( page = client_request.get(
'main.view_job', 'main.view_job',