Revert "Ensure dao_create_template doesn't clash with new trigger"

This commit is contained in:
Pea (Malgorzata Tyczynska)
2019-06-26 18:01:20 +01:00
committed by GitHub
parent 38fb7af2be
commit ccfa1c8228
2 changed files with 11 additions and 14 deletions

View File

@@ -24,19 +24,16 @@ def dao_create_template(template):
template.id = uuid.uuid4() # must be set now so version history model can use same id
template.archived = False
# The template redacted is now being inserted via a trigger
# this will catch any Notify templates being added by a db migration
if not TemplateRedacted.query.filter(TemplateRedacted.template_id == template.id).first():
redacted_dict = {
"template": template,
"redact_personalisation": False,
}
if template.created_by:
redacted_dict.update({"updated_by": template.created_by})
else:
redacted_dict.update({"updated_by_id": template.created_by_id})
redacted_dict = {
"template": template,
"redact_personalisation": False,
}
if template.created_by:
redacted_dict.update({"updated_by": template.created_by})
else:
redacted_dict.update({"updated_by_id": template.created_by_id})
template.template_redacted = TemplateRedacted(**redacted_dict)
template.template_redacted = TemplateRedacted(**redacted_dict)
db.session.add(template)