Merge branch 'master' into celery-jobs

This commit is contained in:
Martyn Inglis
2016-02-25 11:30:28 +00:00
4 changed files with 7 additions and 12 deletions

View File

@@ -31,7 +31,11 @@ def add_service_template(service_id, template_type):
if form.validate_on_submit():
tdao.insert_service_template(
form.name.data, template_type, form.template_content.data, service_id, form.subject.data or None
form.name.data,
template_type,
form.template_content.data,
service_id,
form.subject.data if hasattr(form, 'subject') else None
)
return redirect(
url_for('.choose_template', service_id=service_id, template_type=template_type)