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

private workouts invisible, implemented coachonly workout list view

Browse Source
This commit is contained in:
Sander Roosendaal
2017-02-15 15:07:27 +01:00
parent f327f1aa8e
commit 154619a0dc
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/views.py
View File

@@ -1993,9 +1993,14 @@ def workouts_view(request,message='',successmessage='',
except Team.DoesNotExist: except Team.DoesNotExist:
raise Http404("Team doesn't exist") raise Http404("Team doesn't exist")
if theteam.viewing == 'allmembers' or theteam.manager == request.user:
workouts = Workout.objects.filter(team=theteam, workouts = Workout.objects.filter(team=theteam,
startdatetime__gte=startdate, startdatetime__gte=startdate,
startdatetime__lte=enddate).order_by("-date", "-starttime") startdatetime__lte=enddate).order_by("-date", "-starttime")
elif theteam.viewing == 'coachonly':
workouts = Workout.objects.filter(team=theteam,user=r,
startdatetime__gte=startdate,
startdatetime__lte=enddate).order_by("-date","-starttime")
else: else:
@@ -2128,6 +2133,9 @@ def workout_view(request,id=0):
try: try:
# check if valid ID exists (workout exists) # check if valid ID exists (workout exists)
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if row.privacy == 'private':
raise Http404("Not allowed to view this workout")
g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime") g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
r = Rower.objects.get(id=row.user.id) r = Rower.objects.get(id=row.user.id)
u = User.objects.get(id=r.user.id) u = User.objects.get(id=r.user.id)