From cea9b79428f16a80d08ba9f43e701a19c43f3aff Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 23 Feb 2020 10:06:59 +0100 Subject: [PATCH] bug fixing related to permissions --- rowers/urls.py | 3 ++- rowers/views/statements.py | 4 ++-- rowers/views/workoutviews.py | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/rowers/urls.py b/rowers/urls.py index 625ee831..44d4748a 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -356,7 +356,8 @@ urlpatterns = [ name='workout_video_view_mini'), re_path(r'^video/(?P\w.+)/$',views.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\d+)/$',views.list_videos,name='list_videos'), re_path(r'^add-video/user/(?P\d+)/$',views.video_selectworkout,name='video_selectworkout'), re_path(r'^add-video/',views.video_selectworkout,name='video_selectworkout'), # re_path(r'^workout/(?P\d+)/$',views.workout_view,name='workout_view'), diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 46bc0bce..c3ba97d0 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -374,8 +374,8 @@ def getrequestrower(request,rowerid=0,userid=0,notpermanent=False): userid = int(userid) rowerid = int(rowerid) - if userid == 0: - userid = request.user.id + #if userid == 0: + # userid = request.user.id if notpermanent == False: if rowerid == 0 and 'rowerid' in request.session: diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index e2534c19..cf92e55c 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -1762,7 +1762,7 @@ def workouts_view(request,message='',successmessage='', r = getrequestrower(request,rowerid=rowerid,userid=userid) # check if access is allowed - + startdate = datetime.datetime.combine(startdate,datetime.time()) enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59)) @@ -5187,8 +5187,8 @@ def team_workout_upload_view(request,message="", # A page with all the recent graphs (searchable on workout name) @login_required() -def list_videos(request): - r = getrequestrower(request) +def list_videos(request,userid=0): + r = getrequestrower(request,userid=userid) workouts = Workout.objects.filter(user=r).order_by("-date", "-starttime") query = request.GET.get('q') if query: @@ -5222,6 +5222,7 @@ def list_videos(request): {'analyses': g, 'searchform':searchform, 'active':'nav-analysis', + 'rower':r, 'teams':get_my_teams(request.user), })