Merge branch 'release/v18.8.15'
This commit is contained in:
@@ -1937,7 +1937,7 @@ def workouts_setrpe_view(request):
|
|||||||
duplicate=False,
|
duplicate=False,
|
||||||
startdatetime__gte=startdate,
|
startdatetime__gte=startdate,
|
||||||
startdatetime__lte=enddate
|
startdatetime__lte=enddate
|
||||||
).order_by("-date", "-starttime")
|
).order_by("-date", "-starttime")[0:20]
|
||||||
|
|
||||||
dateform = DateRangeForm(initial={
|
dateform = DateRangeForm(initial={
|
||||||
'startdate': startdate,
|
'startdate': startdate,
|
||||||
@@ -1967,7 +1967,7 @@ def workouts_setrpe_view(request):
|
|||||||
duplicate=False,
|
duplicate=False,
|
||||||
startdatetime__gte=startdate,
|
startdatetime__gte=startdate,
|
||||||
startdatetime__lte=enddate
|
startdatetime__lte=enddate
|
||||||
).order_by("-date", "-starttime")
|
).order_by("-date", "-starttime")[0:20]
|
||||||
|
|
||||||
rpe_formset = WorkoutsRPEFormSet(queryset=workouts)
|
rpe_formset = WorkoutsRPEFormSet(queryset=workouts)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user