From df82b53018fc92f0e28d2eb9c5ef5c10594ccad8 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 3 Nov 2017 13:53:59 +0100
Subject: [PATCH] landingpage sticky in uploadoptions

---
 rowers/forms.py |  5 +++++
 rowers/views.py | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/rowers/forms.py b/rowers/forms.py
index f2f40d1f..f4cfb3aa 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -164,6 +164,11 @@ nextpages = list(landingpages)
 nextpages.append(('workout_upload_view','Upload Another File'))
 nextpages = tuple(nextpages)
 
+class LandingPageForm(forms.Form):
+    landingpage = forms.ChoiceField(choices=nextpages,
+                                    initial='workout_edit_view',
+                                    label='After Upload, go to')
+
 class UploadOptionsForm(forms.Form):
     plotchoices = (
 	('timeplot','Time Plot'),
diff --git a/rowers/views.py b/rowers/views.py
index 9b4820dd..5c18377f 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -27,6 +27,7 @@ from rowers.forms import (
     LoginForm,DocumentsForm,UploadOptionsForm,
     TeamUploadOptionsForm,WorkFlowLeftPanelForm,WorkFlowMiddlePanelForm,
     WorkFlowLeftPanelElement,WorkFlowMiddlePanelElement,
+    LandingPageForm,
     )
 from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied
@@ -7587,6 +7588,7 @@ def workout_add_chart_view(request,id,plotnr=1):
 @login_required()
 def workout_stravaimport_view(request,message=""):
     res = stravastuff.get_strava_workout_list(request.user)
+
     if (res.status_code != 200):
 	if (res.status_code == 401):
 	    r = getrower(request.user)
@@ -7625,7 +7627,7 @@ def workout_stravaimport_view(request,message=""):
 	    res = dict(zip(keys,values))
 	    workouts.append(res)
 
-
+        
 	return render(request,'strava_list_import.html',
 		      {'workouts':workouts,
                        'teams':get_my_teams(request.user),
@@ -8192,7 +8194,11 @@ def workout_upload_view(request,
 
     if 'uploadoptions' in request.session:
         uploadoptions = request.session['uploadoptions']
-        uploadoptions['landingpage'] = r.defaultlandingpage
+        try:
+            defaultlandingpage = uploadoptions['landingpage']
+        except KeyError:
+            uploadoptions['landingpage'] = r.defaultlandingpage
+            defaultlandingpage = r.defaultlandingpage
     else:
         request.session['uploadoptions'] = uploadoptions
 
@@ -8224,6 +8230,7 @@ def workout_upload_view(request,
         landingpage = uploadoptions['landingpage']
     except KeyError:
         landingpage = r.defaultlandingpage
+        uploadoptions['landingpage'] = landingpage
 
     try:
         upload_to_c2 = uploadoptions['upload_to_C2']
@@ -8292,7 +8299,7 @@ def workout_upload_view(request,
                     'upload_to_RunKeeper':upload_to_rk,
                     'upload_to_MapMyFitness':upload_to_ua,
                     'upload_to_TrainingPeaks':upload_to_tp,
-                    'landingpage':r.defaultlandingpage,
+                    'landingpage':landingpage,
                 }