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

bug fixing related to permissions

Browse Source
This commit is contained in:
Sander Roosendaal
2020-02-23 10:06:59 +01:00
parent 9b2f5eb7d1
commit cea9b79428
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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'),

4
rowers/views/statements.py
View File

@@ -374,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:

5
rowers/views/workoutviews.py
View File

@@ -5187,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:
@@ -5222,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),
}) })