Merge branch 'release/v23.6.6'

rowers/views/analysisviews.py

@@ -769,8 +769,10 @@ def cpdata(workouts, options):
             minutevalue = int(tvalue)
         except TypeError:  # pragma: no cover
             minutevalue = 0
-
-        tvalue = int(60*(tvalue-minutevalue))
+        try:
+            tvalue = int(60*(tvalue-minutevalue))
+        except TypeError:  # pragma: no cover
+            tvalue = int(60*tvalue)
 
         if hourvalue >= 24:  # pragma: no cover
             hourvalue = 23

rowers/views/userviews.py

@@ -535,7 +535,10 @@ def rower_exportsettings_view(request, userid=0):
 
 
             r.save()
-            messages.info(request, 'Settings saved')
+            if doset:
+                messages.info(request, 'Settings saved')
+            else: # pragma: no cover
+                messages.error(request, 'Settings not saved: Need a Pro account')
     else:
         form = RowerExportForm(instance=r)