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

Merge tag 'v9.23' into develop

Browse Source 
bla
This commit is contained in:
Sander Roosendaal
2019-02-13 16:51:35 +01:00
parent b9c26b7d67 77bb7e34d2
commit 82d6b09224
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/views/planviews.py
View File

@@ -75,16 +75,16 @@ def plannedsession_comment_view(request,id=0,userid=0):
registrations = VirtualRaceResult.objects.filter(
race__id=ps.id,
emailnotifications=True)
ids = [r.user.userid or r in registrations]
usrs = User.objects.filter(id in ids)
rowers = {u for u in usrs}
ids = [rg.userid for rg in registrations]
rwrs = Rower.objects.filter(id__in= ids)
rowers = {u.user for u in rwrs}
elif ps.sessiontype=='indoorrace':
registrations = IndoorVirtualRaceResult.objects.filter(
race__id=ps.id,
emailnotifications=True)
ids = [r.user.userid or r in registrations]
usrs = User.objects.filter(id in ids)
rowers = {u for u in usrs}
ids = [rg.userid for rg in registrations]
rwrs = Rower.objects.filter(id__in= ids)
rowers = {u.user for u in rwrs}
else:
rowers = {r.user for r in ps.rower.all()}
commenters = set(list(commenters)+list(rowers))