diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-01-28 16:48:03 +0100 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-01-28 16:48:03 +0100 |
| commit | a4bf2658ce6474c1b8dc2d4f8997d8a4c508a1a3 (patch) | |
| tree | f29b7f89faff32d99387da43b6a5825d3f5f0f07 /hyperkitty/templatetags | |
| parent | fd1616185405265189dc6d5ce70cc6c16456088c (diff) | |
| download | hyperkitty-a4bf2658ce6474c1b8dc2d4f8997d8a4c508a1a3.tar.gz hyperkitty-a4bf2658ce6474c1b8dc2d4f8997d8a4c508a1a3.tar.xz hyperkitty-a4bf2658ce6474c1b8dc2d4f8997d8a4c508a1a3.zip | |
fix the favorites system
Diffstat (limited to 'hyperkitty/templatetags')
| -rw-r--r-- | hyperkitty/templatetags/hk_generic.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hyperkitty/templatetags/hk_generic.py b/hyperkitty/templatetags/hk_generic.py index f605df3..1eb2da9 100644 --- a/hyperkitty/templatetags/hk_generic.py +++ b/hyperkitty/templatetags/hk_generic.py @@ -134,9 +134,12 @@ def sender_date(email): @register.filter() -def viewer_date(email): - email_date = email.date.replace(tzinfo=tzutc()) - return localtime(email_date) +def viewer_date(email_or_thread): + if hasattr(email_or_thread, 'date'): + date_obj = email_or_thread.date + elif hasattr(email_or_thread, 'date_active'): + date_obj = email_or_thread.date_active + return localtime(date_obj.replace(tzinfo=tzutc())) SNIPPED_RE = re.compile("^(\s*>).*$", re.M) |