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

Merge branch 'develop' into feature/automagicspm

Browse Source
This commit is contained in:
Sander Roosendaal
2020-02-23 10:07:46 +01:00
parent d58e019d5a 5dbe7d8dad
commit 32cbd28940
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@@ -174,7 +174,7 @@ ratelim==0.1.6
redis==3.2.1 redis==3.2.1
requests==2.21.0 requests==2.21.0
requests-oauthlib==1.2.0 requests-oauthlib==1.2.0
rowingdata==2.6.7 rowingdata==2.7.2
rowingphysics==0.5.0 rowingphysics==0.5.0
rq==0.13.0 rq==0.13.0
rules==2.1 rules==2.1

4
rowers/rower_rules.py
View File

@@ -259,9 +259,9 @@ def is_rower_team_member(user,rower):
for team in teams: for team in teams:
if team.private == 'open': if team.private == 'open':
if team in rower.team.all(): if team in user.rower.team.all():
return True return True
if team.manager == rower.user: if team.manager == user:
return True return True
return False return False

3
rowers/urls.py
View File

@@ -356,7 +356,8 @@ urlpatterns = [
name='workout_video_view_mini'), name='workout_video_view_mini'),
re_path(r'^video/(?P<id>\w.+)/$',views.workout_video_view, re_path(r'^video/(?P<id>\w.+)/$',views.workout_video_view,
name='workout_video_view'), name='workout_video_view'),
re_path(r'^videos/',views.list_videos,name='list_videos'), re_path(r'^videos/$',views.list_videos,name='list_videos'),
re_path(r'^videos/user/(?P<userid>\d+)/$',views.list_videos,name='list_videos'),
re_path(r'^add-video/user/(?P<userid>\d+)/$',views.video_selectworkout,name='video_selectworkout'), re_path(r'^add-video/user/(?P<userid>\d+)/$',views.video_selectworkout,name='video_selectworkout'),
re_path(r'^add-video/',views.video_selectworkout,name='video_selectworkout'), re_path(r'^add-video/',views.video_selectworkout,name='video_selectworkout'),
# re_path(r'^workout/(?P<id>\d+)/$',views.workout_view,name='workout_view'), # re_path(r'^workout/(?P<id>\d+)/$',views.workout_view,name='workout_view'),

7
rowers/views/statements.py
View File

@@ -45,7 +45,8 @@ from rowers.rower_rules import (
can_view_plan,can_change_plan,can_delete_plan, can_view_plan,can_change_plan,can_delete_plan,
can_view_cycle,can_change_cycle,can_delete_cycle, can_view_cycle,can_change_cycle,can_delete_cycle,
can_add_workout_member,can_plan_user,is_paid_coach, can_add_workout_member,can_plan_user,is_paid_coach,
can_start_trial, can_start_plantrial,can_plan,is_workout_team can_start_trial, can_start_plantrial,can_plan,is_workout_team,
is_promember,
) )
from django.shortcuts import render from django.shortcuts import render
@@ -373,8 +374,8 @@ def getrequestrower(request,rowerid=0,userid=0,notpermanent=False):
userid = int(userid) userid = int(userid)
rowerid = int(rowerid) rowerid = int(rowerid)
if userid == 0: #if userid == 0:
userid = request.user.id # userid = request.user.id
if notpermanent == False: if notpermanent == False:
if rowerid == 0 and 'rowerid' in request.session: if rowerid == 0 and 'rowerid' in request.session:

10
rowers/views/workoutviews.py
View File

@@ -1762,11 +1762,6 @@ def workouts_view(request,message='',successmessage='',
r = getrequestrower(request,rowerid=rowerid,userid=userid) r = getrequestrower(request,rowerid=rowerid,userid=userid)
# check if access is allowed # check if access is allowed
if not is_rower_team_member(request.user,r):
request.session['rowerid'] = request.user.rower.id
raise PermissionDenied("Access denied")
startdate = datetime.datetime.combine(startdate,datetime.time()) startdate = datetime.datetime.combine(startdate,datetime.time())
@@ -5192,8 +5187,8 @@ def team_workout_upload_view(request,message="",
# A page with all the recent graphs (searchable on workout name) # A page with all the recent graphs (searchable on workout name)
@login_required() @login_required()
def list_videos(request): def list_videos(request,userid=0):
r = getrequestrower(request) r = getrequestrower(request,userid=userid)
workouts = Workout.objects.filter(user=r).order_by("-date", "-starttime") workouts = Workout.objects.filter(user=r).order_by("-date", "-starttime")
query = request.GET.get('q') query = request.GET.get('q')
if query: if query:
@@ -5227,6 +5222,7 @@ def list_videos(request):
{'analyses': g, {'analyses': g,
'searchform':searchform, 'searchform':searchform,
'active':'nav-analysis', 'active':'nav-analysis',
'rower':r,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
}) })