From f6a263a7b20732df713f0882821a39e726371dc7 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 21 Jan 2020 14:07:23 +0000 Subject: [PATCH] Rename property to more accurately describe purpose `recently_created` says it would just be looking at the `created_at` field to see if it's been created recently. Technically this method isn't doing that, whilst its behaviour would be similar, it's actually different and maybe therefore a bit misleading. --- app/models/job.py | 2 +- app/templates/partials/jobs/notifications.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/job.py b/app/models/job.py index ecb72dd95..3c86c075e 100644 --- a/app/models/job.py +++ b/app/models/job.py @@ -107,7 +107,7 @@ class Job(JSONModel): return self.notification_count == self.notifications_sent @property - def recently_created(self): + def awaiting_processing_or_recently_processed(self): if not self.processing_started: # Assume that if processing hasn’t started yet then the job # must have been created recently enough to not have any diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html index 41d55c73d..869573da2 100644 --- a/app/templates/partials/jobs/notifications.html +++ b/app/templates/partials/jobs/notifications.html @@ -47,7 +47,7 @@ notifications, caption=uploaded_file_name, caption_visible=False, - empty_message='No messages to show yet…' if job.recently_created else 'These messages have been deleted because they were sent more than {} days ago'.format(service_data_retention_days), + empty_message='No messages to show yet…' if job.awaiting_processing_or_recently_processed else 'These messages have been deleted because they were sent more than {} days ago'.format(service_data_retention_days), field_headings=[ 'Recipient', 'Status'