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

Merge tag 'v7.46' into develop

Browse Source 
fix
This commit is contained in:
Sander Roosendaal
2018-08-28 12:58:39 +02:00
parent 4e92296be6 453a1a2c40
commit 27287be369
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/views.py
+2 -1
View File
@@ -4300,7 +4300,8 @@ def otecp_toadmin_view(request,theuser=0,
if theuser == 0: if theuser == 0:
theuser = request.user.id theuser = request.user.id
r = Rower.objects.get(user=theuser) u = User.objects.get(id=theuser)
r = Rower.objects.get(user=u)
startdate = datetime.datetime.combine(startdate,datetime.time()) startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59)) enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))