bug fixed on clone session
was comparing datetime.datetime to datetime.date
This commit is contained in:
@@ -12065,9 +12065,18 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0):
|
|||||||
return HttpResponseRedirect(url)
|
return HttpResponseRedirect(url)
|
||||||
else:
|
else:
|
||||||
if 'fstartdate' in request.session:
|
if 'fstartdate' in request.session:
|
||||||
|
try:
|
||||||
fstartdate = arrow.get(request.session['fstartdate']).date()
|
fstartdate = arrow.get(request.session['fstartdate']).date()
|
||||||
|
except KeyError:
|
||||||
|
fastartdate = timezone.now().date()
|
||||||
|
try:
|
||||||
fenddate = arrow.get(request.session['fenddate']).date()
|
fenddate = arrow.get(request.session['fenddate']).date()
|
||||||
|
except KeyError:
|
||||||
|
fenddate = timezone.now().date()
|
||||||
|
try:
|
||||||
fprefdate = arrow.get(request.session['fprefdate']).date()
|
fprefdate = arrow.get(request.session['fprefdate']).date()
|
||||||
|
except KeyError:
|
||||||
|
fprefdate = timezone.now().date()
|
||||||
|
|
||||||
forminitial = {
|
forminitial = {
|
||||||
'startdate':fstartdate,
|
'startdate':fstartdate,
|
||||||
@@ -12702,8 +12711,8 @@ def plannedsession_clone_view(request,id=0,rowerid=0,
|
|||||||
|
|
||||||
deltadays = ps.enddate-ps.startdate
|
deltadays = ps.enddate-ps.startdate
|
||||||
|
|
||||||
ps.startdate = timezone.now()
|
ps.startdate = timezone.now().date()
|
||||||
ps.enddate = timezone.now()+deltadays
|
ps.enddate = (timezone.now()+deltadays).date()
|
||||||
ps.name += ' (copy)'
|
ps.name += ' (copy)'
|
||||||
|
|
||||||
ps.save()
|
ps.save()
|
||||||
|
|||||||
Reference in New Issue
Block a user