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

Merge branch 'release/v5.87'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-14 21:03:35 +01:00
parent b930d5d70e 55b2f02e51
commit ff18fb419e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/views.py
View File

@@ -11693,6 +11693,8 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek',
).order_by("startdate","enddate")
else:
qset = []
else:
qset = []
if not qset:
qset = PlannedSession.objects.filter(
@@ -11842,6 +11844,7 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
'teamform':sessionteamselectform,
'timeperiod':timeperiod,
'plannedsessions':sps,
'rower':r,
})
# Manager edits sessions for entire team
@@ -11956,6 +11959,7 @@ def plannedsession_teamedit_view(request,timeperiod='thisweek',
'rowersform':sessionrowerform,
'timeperiod':timeperiod,
'plannedsessions':sps,
'rower':r,
})
@user_passes_test(iscoachmember,login_url="/rowers/planmembership/",
@@ -12247,6 +12251,7 @@ def plannedsession_clone_view(request,id=0,rowerid=0,
'id':ps.id,
'timeperiod':timeperiod,
'rowerid':r.id,
'rower':r,
}
)
@@ -12284,6 +12289,7 @@ def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0):
kwargs={
'timeperiod':timeperiod,
'sessionid':id,
'rower':r,
})
return HttpResponseRedirect(url)
@@ -12424,6 +12430,8 @@ def plannedsession_deleteconfirm_view(request,id=0):
'psdict': psdict,
'attrs':[
'name','startdate','enddate','sessiontype',
]
],
'rower':r,
}
)