Merge branch 'develop' into feature/restapi
This commit is contained in:
@@ -1845,7 +1845,7 @@ def workout_recalcsummary_view(request,id=0):
|
|||||||
def workouts_view(request,message='',successmessage='',
|
def workouts_view(request,message='',successmessage='',
|
||||||
startdatestring="",enddatestring="",
|
startdatestring="",enddatestring="",
|
||||||
startdate=timezone.now()-datetime.timedelta(days=365),
|
startdate=timezone.now()-datetime.timedelta(days=365),
|
||||||
enddate=timezone.now()):
|
enddate=timezone.now()+datetime.timedelta(days=1)):
|
||||||
try:
|
try:
|
||||||
r = Rower.objects.get(user=request.user)
|
r = Rower.objects.get(user=request.user)
|
||||||
# res = mailprocessing.safeprocessattachments()
|
# res = mailprocessing.safeprocessattachments()
|
||||||
|
|||||||
Reference in New Issue
Block a user