sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge tag 'v7.15' into develop

Browse Source 
bug fix
This commit is contained in:
Sander Roosendaal
2018-07-03 08:28:22 +02:00
parent 4214a4fcfc 5dec4db71e
commit f1d3326a2d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/utils.py
View File

@@ -7,6 +7,8 @@ from django.conf import settings
import uuid import uuid
import datetime import datetime
from django.http import HttpResponse
import requests import requests
lbstoN = 4.44822 lbstoN = 4.44822

18
rowers/views.py
View File

@@ -5321,7 +5321,7 @@ def workouts_join_select(request,
message='', message='',
successmessage='', successmessage='',
startdate=timezone.now()-datetime.timedelta(days=30), startdate=timezone.now()-datetime.timedelta(days=30),
enddate=timezone.now(), enddate=timezone.now()+datetime.timedelta(days=1),
teamid=0): teamid=0):
try: try:
@@ -5329,12 +5329,12 @@ def workouts_join_select(request,
except Rower.DoesNotExist: except Rower.DoesNotExist:
raise Http404("Rower doesn't exist") raise Http404("Rower doesn't exist")
if 'startdate' in request.session: # if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate']) # startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session: # if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate']) # enddate = iso8601.parse_date(request.session['enddate'])
if 'waterboattype' in request.session: if 'waterboattype' in request.session:
@@ -5488,12 +5488,12 @@ def team_comparison_select(request,
except Rower.DoesNotExist: except Rower.DoesNotExist:
raise Http404("Rower doesn't exist") raise Http404("Rower doesn't exist")
if 'startdate' in request.session: # if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate']) # startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session: # if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate']) # enddate = iso8601.parse_date(request.session['enddate'])
if 'waterboattype' in request.session: if 'waterboattype' in request.session: