diff --git a/rowers/templates/menu_plan.html b/rowers/templates/menu_plan.html index d6a448ec..7177f790 100644 --- a/rowers/templates/menu_plan.html +++ b/rowers/templates/menu_plan.html @@ -63,7 +63,7 @@
  • -  Add Team Session +  Add Group Session
  • diff --git a/rowers/templates/plannedsessionsmanage.html b/rowers/templates/plannedsessionsmanage.html index 0e12facf..fa78f7b1 100644 --- a/rowers/templates/plannedsessionsmanage.html +++ b/rowers/templates/plannedsessionsmanage.html @@ -90,7 +90,7 @@
  • {% csrf_token %} - +
  • diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html index ee840e64..f5aa1c88 100644 --- a/rowers/templates/plannedsessionview.html +++ b/rowers/templates/plannedsessionview.html @@ -96,6 +96,10 @@ {% endfor %} +

    + + Add, remove or change workouts for this session +

  • {{ rower.user.first_name }} {{ rower.user.last_name }}

    diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 8a0e0dd6..c9b47c1d 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index f892ed03..73e01c79 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -1163,9 +1163,10 @@ def workouts_view(request,message='',successmessage='', request.session['referer'] = absolute(request)['PATH'] r = getrequestrower(request,rowerid=rowerid,userid=userid) + # check if access is allowed if not checkviewworkouts(request.user,r): - raise PermissionDenied("Access denied") + raise PermissionDenied("Access denied") @@ -4439,7 +4440,7 @@ def graph_show_view(request,id): 'name':'Workouts' }, { - 'url':get_workout_default_page(request,w.id), + 'url':get_workout_default_page(request,encoder.encode_hex(w.id)), 'name': w.name }, {