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

Merge pull request #2661 from alphagov/cant-choose-postage-if-can-choose-template

Browse Source 
Don’t give postage choice on service and template
This commit is contained in:
Chris Hill-Scott
2019-01-29 09:48:39 +00:00
committed by GitHub
parent 44ebf1485d 309de074c3
commit 0d3dec1058
3 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -571,7 +571,7 @@ def service_set_letters(service_id):
@user_has_permissions('manage_service')
def service_set_postage(service_id):
if not current_service.has_permission('letter'):
if (not current_service.has_permission('letter')) or current_service.has_permission('choose_postage'):
abort(404)
form = ServicePostageForm(postage=current_service.postage)

22
app/templates/views/service-settings.html
View File

@@ -234,18 +234,20 @@
)}}
{% endcall %}
{% call settings_row(if_has_permission='letter') %}
{{ text_field('Postage') }}
{% if current_service.has_permission('letter') and not current_service.has_permission('choose_postage') %}
{% call settings_row() %}
{{ text_field('Postage') }}
{% set postage = {'first': 'First class only', 'second': 'Second class only'} %}
{{ text_field(postage[current_service.postage]) }}
{{ edit_field(
'Change',
url_for('.service_set_postage',
service_id=current_service.id),
permissions=['manage_service']
)
}}
{% endcall %}
{{ edit_field(
'Change',
url_for('.service_set_postage',
service_id=current_service.id),
permissions=['manage_service']
)
}}
{% endcall %}
{% endif %}
{% endcall %}
</div>