Merge branch 'hotfix/v4.61'

2017-10-26 19:10:01 +02:00
parent 39ca755c59 50a17f97ac
commit 5c3186cd83
1 changed files with 3 additions and 2 deletions
@@ -6096,7 +6096,9 @@ def workout_flexchart3_view(request,*args,**kwargs):
        try:
            t = favorites[favoritenr].xparam
        except IndexError:
-            favoritenr=-1
+            favoritenr=0
+        except AssertionError:
+            favoritenr=0
        
    if 'xparam' in kwargs:
        xparam = kwargs['xparam']
@@ -6126,7 +6128,6 @@ def workout_flexchart3_view(request,*args,**kwargs):
        else:
            yparam2 = 'hr'

-    print favoritenr
    if favoritenr>=0 and r.showfavoritechartnotes:
        favoritechartnotes = favorites[favoritenr].notes
    else: