Merge branch 'dev' into feature-frontend-task-queue

This commit is contained in:
Michael Shamoon
2022-06-08 19:44:23 -07:00
103 changed files with 22447 additions and 14558 deletions

View File

@@ -234,10 +234,13 @@ class Document(models.Model):
# Convert UTC database time to local time
created = datetime.date.isoformat(timezone.localdate(self.created))
if self.correspondent and self.title:
return f"{created} {self.correspondent} {self.title}"
else:
return f"{created} {self.title}"
res = f"{created}"
if self.correspondent:
res += f" {self.correspondent}"
if self.title:
res += f" {self.title}"
return res
@property
def source_path(self):