Merge tag 'flexchartfavs' into develop
bugfix flexchart
This commit is contained in:
@@ -88,7 +88,7 @@ class Command(BaseCommand):
|
|||||||
res += ['fail: '+name]
|
res += ['fail: '+name]
|
||||||
donotdelete = 1
|
donotdelete = 1
|
||||||
try:
|
try:
|
||||||
dd = send_confirm(u,name,link)
|
dd = send_confirm(rr.user,name,link)
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -3003,7 +3003,8 @@ def workout_flexchart3_view(request,*args,**kwargs):
|
|||||||
favorites = FavoriteChart.objects.filter(user=r,
|
favorites = FavoriteChart.objects.filter(user=r,
|
||||||
workouttype__in=[workouttype,'both']).order_by("id")
|
workouttype__in=[workouttype,'both']).order_by("id")
|
||||||
maxfav = len(favorites)-1
|
maxfav = len(favorites)-1
|
||||||
except:
|
except:
|
||||||
|
favorites = None
|
||||||
maxfav = 0
|
maxfav = 0
|
||||||
|
|
||||||
# check if favoritenr is not out of range
|
# check if favoritenr is not out of range
|
||||||
|
|||||||
Reference in New Issue
Block a user