Merge branch 'release/v23.6.6'
This commit is contained in:
BIN
Binary file not shown.
@@ -769,8 +769,10 @@ def cpdata(workouts, options):
|
|||||||
minutevalue = int(tvalue)
|
minutevalue = int(tvalue)
|
||||||
except TypeError: # pragma: no cover
|
except TypeError: # pragma: no cover
|
||||||
minutevalue = 0
|
minutevalue = 0
|
||||||
|
try:
|
||||||
tvalue = int(60*(tvalue-minutevalue))
|
tvalue = int(60*(tvalue-minutevalue))
|
||||||
|
except TypeError: # pragma: no cover
|
||||||
|
tvalue = int(60*tvalue)
|
||||||
|
|
||||||
if hourvalue >= 24: # pragma: no cover
|
if hourvalue >= 24: # pragma: no cover
|
||||||
hourvalue = 23
|
hourvalue = 23
|
||||||
|
|||||||
@@ -535,7 +535,10 @@ def rower_exportsettings_view(request, userid=0):
|
|||||||
|
|
||||||
|
|
||||||
r.save()
|
r.save()
|
||||||
|
if doset:
|
||||||
messages.info(request, 'Settings saved')
|
messages.info(request, 'Settings saved')
|
||||||
|
else: # pragma: no cover
|
||||||
|
messages.error(request, 'Settings not saved: Need a Pro account')
|
||||||
else:
|
else:
|
||||||
form = RowerExportForm(instance=r)
|
form = RowerExportForm(instance=r)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user