Merge branch 'release/v20.1.11'
This commit is contained in:
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
Binary file not shown.
@@ -142,7 +142,7 @@ def do_sync(w, options, quick=False):
|
|||||||
# upload_to_strava = False
|
# upload_to_strava = False
|
||||||
do_strava_export = False
|
do_strava_export = False
|
||||||
w.save()
|
w.save()
|
||||||
record = create_or_update_syncrecord(w.user, w, {stravaid:options['stravaid']})
|
record = create_or_update_syncrecord(w.user, w, stravaid=options['stravaid'])
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -150,7 +150,7 @@ def do_sync(w, options, quick=False):
|
|||||||
if options['nkid'] != 0 and options['nkid'] != '': # pragma: no cover
|
if options['nkid'] != 0 and options['nkid'] != '': # pragma: no cover
|
||||||
w.uploadedtonk = options['nkid']
|
w.uploadedtonk = options['nkid']
|
||||||
w.save()
|
w.save()
|
||||||
record = create_or_update_syncrecord(w.user, w, {nkid:options['nkid']})
|
record = create_or_update_syncrecord(w.user, w, nkid=options['nkid'])
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -185,7 +185,7 @@ def do_sync(w, options, quick=False):
|
|||||||
# upload_to_c2 = False
|
# upload_to_c2 = False
|
||||||
do_c2_export = False
|
do_c2_export = False
|
||||||
w.save()
|
w.save()
|
||||||
record = create_or_update_syncrecord(w.user, w, {c2id:options['c2id']})
|
record = create_or_update_syncrecord(w.user, w, c2id=options['c2id'])
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -193,7 +193,7 @@ def do_sync(w, options, quick=False):
|
|||||||
if options['rp3id'] != 0 and options['rp3id'] != '': # pragma: no cover
|
if options['rp3id'] != 0 and options['rp3id'] != '': # pragma: no cover
|
||||||
w.uploadedtorp3 = options['rp3id']
|
w.uploadedtorp3 = options['rp3id']
|
||||||
w.save()
|
w.save()
|
||||||
record = create_or_update_syncrecord(w.user, w, {rp3id:options['rp3id']})
|
record = create_or_update_syncrecord(w.user, w, rp3id=options['rp3id'])
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -244,7 +244,7 @@ def do_sync(w, options, quick=False):
|
|||||||
w.uploadedtosporttracks = sporttracksid
|
w.uploadedtosporttracks = sporttracksid
|
||||||
w.save()
|
w.save()
|
||||||
do_st_export = False
|
do_st_export = False
|
||||||
record = create_or_update_syncrecord(w.user, w, {'sporttracksid':sporttracksid})
|
record = create_or_update_syncrecord(w.user, w, sporttracksid=sporttracksid)
|
||||||
try: # pragma: no cover
|
try: # pragma: no cover
|
||||||
upload_to_st = options['upload_to_SportTracks'] or do_st_export
|
upload_to_st = options['upload_to_SportTracks'] or do_st_export
|
||||||
do_st_export = upload_to_st
|
do_st_export = upload_to_st
|
||||||
|
|||||||
Reference in New Issue
Block a user