Merge branch 'release/v8.13'

rowers/dataprep.py

@@ -1398,6 +1398,8 @@ def new_workout_from_df(r, df,
     if parent:
         oarlength = parent.oarlength
         inboard = parent.inboard
+
+        
         workouttype = parent.workouttype
         boattype = parent.boattype
         notes = parent.notes

rowers/middleware.py

@@ -65,6 +65,7 @@ def do_update(user,mode='rower',days=42):
 
     return 1
 
+
 class PowerTimeFitnessMetricMiddleWare(object):
     def process_request(self, request):
         # Code to be executed before the view is called

rowers/templates/menu_workout.html

@@ -84,7 +84,7 @@
       </li>
       <li id="chart-otwpower">
         <a href="/rowers/workout/{{ workout.id }}/interactiveotwplot">
-          <i class="fal fa-calculator-alt fa-fw"></i>&nbsp;OTW Power
+          <i class="fal fa-calculator-alt fa-fw"></i>&nbsp;Corrected Pace Plot
         </a>
       </li>
       {% endif %}

rowers/views.py

@@ -7009,6 +7009,8 @@ def workout_undo_smoothenpace_view(
 def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
     row = get_workout(id)
 
+    previousurl = request.META.get('HTTP_REFERER')
+
     r = getrower(request.user)
     
     if (checkworkoutuser(request.user,row)==False):
@@ -7040,11 +7042,14 @@ def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
     row.write_csv(filename,gzip=True)
     dataprep.update_strokedata(id,row.df)
 
-    url = reverse(r.defaultlandingpage,
+    if previousurl:
-                  kwargs = {
+        url = previousurl
-                      'id':id,
+    else:
+        url = reverse(r.defaultlandingpage,
+                      kwargs = {
+                          'id':id,
                       }
-                  )
+        )
 
     return HttpResponseRedirect(url)
 
@@ -11651,7 +11656,7 @@ def workout_fusion_view(request,id1=0,id2=1):
         },
         {
             'url':reverse(workout_fusion_view,kwargs={'id1':id1,'id2':id2}),
-            'name': 'Sensor Fusion'
+            'name': str(w2.id)
         }
             
     ]