Merge branch 'release/v12.53'

2020-05-23 16:38:01 +02:00
parent 1b12a1dd4c 012b641466
commit b47b4ee2f9
1 changed files with 4 additions and 1 deletions
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -237,7 +237,10 @@ def durationprint(d,dstring):
    if (d == None):
        return d
    else:
-        return d.strftime(dstring)[:-5]
+        try:
+            return d.strftime(dstring)[:-5]
+        except AttributeError:
+            return None

 def getstartenddate(timeperiod):
    s,e = timeperiod.split('/')