From e6b80646b7164cf0970d7699afa506d9dd2c2071 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 18 Oct 2017 16:34:22 +0200 Subject: [PATCH] added return to workout link --- rowers/templates/workflowconfig.html | 7 +++++++ rowers/views.py | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/rowers/templates/workflowconfig.html b/rowers/templates/workflowconfig.html index 595f25e5..d5795eb4 100644 --- a/rowers/templates/workflowconfig.html +++ b/rowers/templates/workflowconfig.html @@ -9,6 +9,13 @@ {{ formmiddle.media }}
+ {% if workoutid %} + + {% endif %}

Workflow Page Configuration

On this page, you can add and remove elements from the left and middle panels of your Workflow page. diff --git a/rowers/views.py b/rowers/views.py index 1966bdf7..3b84a33c 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -5857,6 +5857,12 @@ def workout_comparison_view2(request,id1=0,id2=0,xparam='distance', def workout_workflow_config_view(request): request.session['referer'] = absolute(request)['PATH'] request.session[translation.LANGUAGE_SESSION_KEY] = USER_LANGUAGE + try: + workoutid = request.session['lastworkout'] + except KeyError: + workoutid = 0 + + r = getrower(request.user) if request.method == 'POST' and 'leftpanel' in request.POST: formleft = WorkFlowLeftPanelForm(request.POST) @@ -5882,12 +5888,14 @@ def workout_workflow_config_view(request): 'rower':r, 'formleft':formleft, 'formmiddle':formmiddle, + 'workoutid': workoutid, }) # Workflow View @login_required() def workout_workflow_view(request,id): request.session['referer'] = absolute(request)['PATH'] + request.session['lastworkout'] = id request.session[translation.LANGUAGE_SESSION_KEY] = USER_LANGUAGE try: row = Workout.objects.get(id=id)