made a landing page option

rowers/views.py

@@ -4454,6 +4454,7 @@ def workouts_view(request,message='',successmessage='',
     
     return render(request, 'list_workouts.html',
                   {'workouts': workouts,
+                   'rower':r,
                    'dateform':dateform,
                    'startdate':startdate,
                    'enddate':enddate,
@@ -7587,13 +7588,17 @@ def workout_upload_view(request,
                             'make_plot':False,
                             'upload_to_C2':False,
                             'plottype':'timeplot',
+                            'landingpage':'workout_edit_view',
                         },
                         docformoptions={
                             'workouttype':'rower',
                         }):
 
+    r = getrower(request.user)
+
     if 'uploadoptions' in request.session:
         uploadoptions = request.session['uploadoptions']
+        uploadoptions['landingpage'] = r.defaultlandingpage
     else:
         request.session['uploadoptions'] = uploadoptions
 
@@ -7651,7 +7656,6 @@ def workout_upload_view(request,
     except KeyError:
         upload_totp = False
 
-    r = getrower(request.user)
     if request.method == 'POST':
 	form = DocumentsForm(request.POST,request.FILES)
 	optionsform = UploadOptionsForm(request.POST)
@@ -7676,6 +7680,7 @@ def workout_upload_view(request,
 	        upload_to_ua = optionsform.cleaned_data['upload_to_MapMyFitness']
 	        upload_to_tp = optionsform.cleaned_data['upload_to_TrainingPeaks']
                 makeprivate = optionsform.cleaned_data['makeprivate']
+                landingpage = optionsform.cleaned_data['landingpage']
 
                 uploadoptions = {
                     'makeprivate':makeprivate,
@@ -7687,6 +7692,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,
                 }
 
 
@@ -7809,8 +7815,8 @@ def workout_upload_view(request,
                     messages.info(request,message)
                 else:
                     messages.error(request,message)
-                    
-            url = reverse(workout_edit_view,
+
+            url = reverse(landingpage,
                           kwargs = {
                               'id':w.id,
                           })
@@ -7826,6 +7832,7 @@ def workout_upload_view(request,
 	return response
     else:
 	form = DocumentsForm(initial=docformoptions)
+        print uploadoptions
 	optionsform = UploadOptionsForm(initial=uploadoptions)
 	return render(request, 'document_form.html',
 		      {'form':form, 
@@ -8778,6 +8785,7 @@ def rower_edit_view(request,message=""):
             first_name = ucd['first_name']
             last_name = ucd['last_name']
             email = ucd['email']
+            defaultlandingpage = cd['defaultlandingpage']
             weightcategory = cd['weightcategory']
             getemailnotifications = cd['getemailnotifications']
             defaulttimezone=cd['defaulttimezone']
@@ -8794,6 +8802,7 @@ def rower_edit_view(request,message=""):
             r.defaulttimezone=defaulttimezone
             r.weightcategory = weightcategory
             r.getemailnotifications = getemailnotifications
+            r.defaultlandingpage = defaultlandingpage
             r.save()
             form = RowerForm(instance=r)
 	    powerform = RowerPowerForm(instance=r)