Merge branch 'release/v6.58'
This commit is contained in:
+1
-1
@@ -1319,8 +1319,8 @@ def new_workout_from_file(r, f2,
|
||||
return (0, message, '')
|
||||
|
||||
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
|
||||
dosummary = dosummary or summary == ''
|
||||
|
||||
|
||||
id, message = save_workout_database(
|
||||
f2, r,
|
||||
workouttype=workouttype,
|
||||
|
||||
@@ -118,6 +118,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
|
||||
return 0
|
||||
|
||||
summary = ''
|
||||
|
||||
|
||||
# handle non-Painsled
|
||||
if fileformat != 'csv':
|
||||
@@ -147,9 +148,11 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
|
||||
row.write_csv(datafilename, gzip=True)
|
||||
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
|
||||
|
||||
dosummary = dosummary or summary == ''
|
||||
|
||||
if name == '':
|
||||
name = 'Workout from Background Queue'
|
||||
|
||||
@@ -157,6 +160,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
|
||||
datafilename, rower,
|
||||
workouttype=workouttype,
|
||||
dosummary=dosummary,
|
||||
summary=summary,
|
||||
inboard=inboard,
|
||||
oarlength=oarlength,
|
||||
title=name,
|
||||
|
||||
Reference in New Issue
Block a user