Update utils for Markdown parsing + subbranding

Markdown parsing (will be active but isn’t documented):
- [x] https://github.com/alphagov/notifications-utils/pull/54

Email sub branding (not used yet):
- [x] https://github.com/alphagov/notifications-utils/pull/55

Required modification to the email preview endpoint to make sure that
it only included the message and not any HTML.
This commit is contained in:
Chris Hill-Scott
2016-07-22 10:55:08 +01:00
parent 0622791e83
commit 68fd4947cb
2 changed files with 3 additions and 2 deletions

View File

@@ -14,6 +14,7 @@ from app.dao.templates_dao import (
dao_get_template_versions dao_get_template_versions
) )
from notifications_utils.template import Template from notifications_utils.template import Template
from notifications_utils.renderers import PassThrough
from app.dao.services_dao import dao_fetch_service_by_id from app.dao.services_dao import dao_fetch_service_by_id
from app.models import SMS_TYPE from app.models import SMS_TYPE
from app.schemas import (template_schema, template_history_schema) from app.schemas import (template_schema, template_history_schema)
@@ -91,7 +92,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): 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) 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 data = template_schema.dump(fetched_template).data
template_object = Template(data, values=request.args.to_dict()) template_object = Template(data, values=request.args.to_dict(), renderer=PassThrough())
if template_object.missing_data: if template_object.missing_data:
raise InvalidRequest( raise InvalidRequest(

View File

@@ -23,4 +23,4 @@ statsd==3.2.1
git+https://github.com/alphagov/notifications-python-client.git@1.0.0#egg=notifications-python-client==1.0.0 git+https://github.com/alphagov/notifications-python-client.git@1.0.0#egg=notifications-python-client==1.0.0
git+https://github.com/alphagov/notifications-utils.git@8.4.1#egg=notifications-utils==8.4.1 git+https://github.com/alphagov/notifications-utils.git@8.6.0#egg=notifications-utils==8.6.0