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

fixed access to teams

Browse Source
This commit is contained in:
Sander Roosendaal
2019-08-29 07:59:13 +02:00
parent 3357a06d4a
commit b6a1a7646b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/views/teamviews.py
View File

@@ -16,11 +16,16 @@ def team_view(request,id=0,userid=0):
teams.remove_expired_invites() teams.remove_expired_invites()
try: try:
t = Team.objects.get(id=id) t = Team.objects.get(id=id)
except Team.DoesNotExist: except Team.DoesNotExist:
raise Http404("Team doesn't exist") raise Http404("Team doesn't exist")
if r.rowerplan == 'basic' and t.manager.rower.rowerplan != 'coach':
raise PermissionDenied("You need to be on a Paid Plan to see or join this team")
q = User.objects.filter(rower__isnull=False,rower__team__in=myteams).distinct().exclude(rower__team__name=t.name) q = User.objects.filter(rower__isnull=False,rower__team__in=myteams).distinct().exclude(rower__team__name=t.name)
mygroups = [request.user.rower.mycoachgroup] mygroups = [request.user.rower.mycoachgroup]
q2 = User.objects.filter(rower__isnull=False,rower__coachinggroups__in=mygroups).distinct().exclude(rower__team__name=t.name) q2 = User.objects.filter(rower__isnull=False,rower__coachinggroups__in=mygroups).distinct().exclude(rower__team__name=t.name)
@@ -168,8 +173,8 @@ def get_teams(request):
private='open').exclude( private='open').exclude(
rower=r).exclude(manager=request.user).order_by('name') rower=r).exclude(manager=request.user).order_by('name')
if rower.rowerplan == 'basic': if r.rowerplan == 'basic':
otherteams.exclude(manager__rower__rowerplan='freecoach') otherteams = otherteams.filter(manager__rower__rowerplan='coach')
return myteams, memberteams, otherteams return myteams, memberteams, otherteams