Private
Public Access
1
0

Merge branch 'develop' into feature/metrics

This commit is contained in:
Sander Roosendaal
2020-01-01 15:24:02 +01:00
3 changed files with 24 additions and 21 deletions

View File

@@ -821,7 +821,10 @@ def get_userid(access_token):
return 0 return 0
try:
me_json = response.json() me_json = response.json()
except JSONDecodeError:
return 0
try: try:
res = me_json['data']['id'] res = me_json['data']['id']
except KeyError: except KeyError:

View File

@@ -506,6 +506,7 @@ def do_sync(w,options):
try: try:
if options['stravaid'] != 0: if options['stravaid'] != 0:
w.uploadedtostrava = options['stravaid'] w.uploadedtostrava = options['stravaid']
options['upload_to_Strava'] = False
w.save() w.save()
except KeyError: except KeyError:
pass pass
@@ -524,7 +525,6 @@ def do_sync(w,options):
if ('upload_to_Strava' in options and not options['upload_to_Strava']): if ('upload_to_Strava' in options and not options['upload_to_Strava']):
pass pass
else: else:
if options['stravaid'] != 0:
try: try:
message,id = stravastuff.workout_strava_upload( message,id = stravastuff.workout_strava_upload(
w.user.user,w w.user.user,w