Merge branch 'hotfix/v3.58'

2017-08-11 18:12:30 +02:00
parent 64dd85a79a f1cef80268
commit 3a866737b5
1 changed files with 7 additions and 4 deletions
@@ -4200,11 +4200,14 @@ def workouts_view(request,message='',successmessage='',
    # start date for the small graph
    activity_startdate = enddate-datetime.timedelta(days=15)

+    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

        
    if teamid: