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

passing tests again - now with coachinggroups

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-16 19:43:21 +01:00
parent ccdf24f671
commit 5f8fd9315a
8 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/views/workoutviews.py
View File

@@ -1,5 +1,5 @@
from statements import *
import rowers.teams as teams
# Show the EMpower Oarlock generated Stroke Profile
@user_passes_test(ispromember,login_url="/rowers/paidplans/",
@@ -4235,7 +4235,7 @@ def team_workout_upload_view(request,message="",
rowerform = TeamInviteForm(request.POST)
rowerform.fields.pop('email')
rowers = Rower.objects.filter(coaches__in=[request.user.rower]).distinct()
rowers = Rower.objects.filter(coachinggroups__in=[r.mycoachgroup]).distinct()
rowerform.fields['user'].queryset = User.objects.filter(rower__in=rowers).distinct()
if form.is_valid():
f = request.FILES['file']
@@ -4246,7 +4246,7 @@ def team_workout_upload_view(request,message="",
workouttype = form.cleaned_data['workouttype']
if rowerform.is_valid():
u = rowerform.cleaned_data['user']
if u and request.user.rower in u.rower.coaches.all():
if u and request.user.rower in teams.rower_get_coaches(u.rower):
r = getrower(u)
else:
message = 'Please select a rower'