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

service_default postage resets template postage to None

Browse Source
This commit is contained in:
Pea Tyczynska
2018-12-19 10:58:35 +00:00
parent 687e9e5866
commit 695f1150b5
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -581,11 +581,8 @@ def edit_service_template(service_id, template_id):
'process_type': form.process_type.data,
'reply_to_text': template['reply_to_text'],
}
if (
current_service.has_permission("choose_postage") and template["template_type"] == "letter"
) and form.postage.data in ["first", "second"]:
postage = {"postage": form.postage.data }
if current_service.has_permission("choose_postage") and template["template_type"] == "letter":
postage = {"postage": form.postage.data}
else:
postage = {}

10
app/notify_client/service_api_client.py
View File

@@ -153,7 +153,9 @@ class ServiceAPIClient(NotifyAdminAPIClient):
@cache.delete('service-{service_id}-templates')
@cache.delete('template-{id_}-version-None')
@cache.delete('template-{id_}-versions')
def update_service_template(self, id_, name, type_, content, service_id, subject=None, process_type=None, postage=None):
def update_service_template(
self, id_, name, type_, content, service_id, subject=None, process_type=None, postage=None
):
"""
Update a service template.
"""
@@ -172,10 +174,14 @@ class ServiceAPIClient(NotifyAdminAPIClient):
data.update({
'process_type': process_type
})
if postage:
if postage in ["first", "second"]:
data.update({
'postage': postage
})
elif postage == "service_default":
data.update({
'postage': None
})
data = _attach_current_user(data)
endpoint = "/service/{0}/template/{1}".format(service_id, id_)
return self.post(endpoint, data)