Merge tag 'v3.58' into develop

hotfix datetime naive
2017-08-11 18:13:05 +02:00
parent 7e99c3e57b 3a866737b5
commit eeea67d511
1 changed files with 7 additions and 4 deletions
@@ -4200,10 +4200,13 @@ def workouts_view(request,message='',successmessage='',
    # start date for the small graph
    activity_startdate = enddate-datetime.timedelta(days=15)

-    if utc.localize(enddate) > timezone.now():
-        activity_enddate = timezone.now()
-        activity_startdate = activity_enddate-datetime.timedelta(days=15)
-    else:
+    try:
+        if utc.localize(enddate) > timezone.now():
+            activity_enddate = timezone.now()
+            activity_startdate = activity_enddate-datetime.timedelta(days=15)
+        else:
+            activity_enddate = enddate
+    except ValueError:
        activity_enddate = enddate