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

Use new properties of utils Templates

Browse Source 
We’ve added some new properties to the templates in utils that we can
use instead of doing weird things like
`WithSubjectTemplate.__str__(another_instance)`
This commit is contained in:
Chris Hill-Scott
2020-04-13 13:48:23 +01:00
parent ee25dc79e4
commit 5ddb5a75da
10 changed files with 28 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models.py
View File

@@ -1513,16 +1513,16 @@ class Notification(db.Model):
@property
def content(self):
from app.utils import get_template_instance
template_object = get_template_instance(self.template.__dict__, self.personalisation)
return str(template_object)
return self.template._as_utils_template_with_personalisation(
self.personalisation
).content_with_placeholders_filled_in
@property
def subject(self):
from app.utils import get_template_instance
if self.notification_type != SMS_TYPE:
template_object = get_template_instance(self.template.__dict__, self.personalisation)
return template_object.subject
template_object = self.template._as_utils_template_with_personalisation(
self.personalisation
)
return getattr(template_object, 'subject', None)
@property
def formatted_status(self):