From 87325061384e6e781783f270d5db67b69e679195 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Wed, 3 Jan 2018 15:10:16 +0000 Subject: [PATCH] Add reply_to in the template schema --- app/schemas.py | 5 ++++- app/template/rest.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/schemas.py b/app/schemas.py index 2afa6270d..dccd50e6f 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -315,11 +315,14 @@ class BaseTemplateSchema(BaseSchema): reply_to = fields.Method("get_reply_to", allow_none=True) def get_reply_to(self, template): + if template.template_type == 'letter': + text = template.get_reply_to_text() + return text return template.reply_to class Meta: model = models.Template - exclude = ("service_id", "jobs", "service_letter_contact_id") + exclude = ("service_id", "jobs") strict = True diff --git a/app/template/rest.py b/app/template/rest.py index 3f03ece60..8458bafbe 100644 --- a/app/template/rest.py +++ b/app/template/rest.py @@ -120,7 +120,7 @@ def get_template_by_id_and_service_id(service_id, template_id): def preview_template_by_id_and_service_id(service_id, template_id): fetched_template = dao_get_template_by_id_and_service_id(template_id=template_id, service_id=service_id) data = template_schema.dump(fetched_template).data - + print(data) template_object = get_template_instance(data, values=request.args.to_dict()) if template_object.missing_data: