Merge branch 'release/v10.74'

2019-12-29 09:32:03 +01:00
parent 58ec7f15cb ad249b8c6d
commit e1999856b5
3 changed files with 21 additions and 21 deletions
--- a/rowers/uploads.py
+++ b/rowers/uploads.py
@@ -506,6 +506,7 @@ def do_sync(w,options):
    try:
        if options['stravaid'] != 0:
            w.uploadedtostrava = options['stravaid']
+            options['upload_to_Strava'] = False
            w.save()
    except KeyError:
        pass
@@ -524,7 +525,6 @@ def do_sync(w,options):
        if ('upload_to_Strava' in options and not options['upload_to_Strava']):
            pass
        else:
-            if options['stravaid'] != 0:
            try:
                message,id = stravastuff.workout_strava_upload(
                w.user.user,w