sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v11.10'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-02-19 17:31:45 +01:00
parent 4a72ab7da3 4b9e4ee0e1
commit 80d4a236d6
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/uploads.py
View File

@@ -508,7 +508,11 @@ def make_private(w,options):
return 1 return 1
def do_sync(w,options): def do_sync(w,options):
try:
upload_to_strava = options['upload_to_Strava'] upload_to_strava = options['upload_to_Strava']
except KeyError:
upload_to_strava = False
try: try:
if options['stravaid'] != 0 and options['stravaid'] != '': if options['stravaid'] != 0 and options['stravaid'] != '':
w.uploadedtostrava = options['stravaid'] w.uploadedtostrava = options['stravaid']

5
rowers/views/workoutviews.py
View File

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
import hashlib import hashlib
from shutil import copyfile from shutil import copyfile
from six import iterlists
from rowers.views.statements import * from rowers.views.statements import *
import rowers.teams as teams import rowers.teams as teams
import rowers.mytypes as mytypes import rowers.mytypes as mytypes
@@ -4405,7 +4405,8 @@ def workout_upload_api(request):
secret = json_data['secret'] secret = json_data['secret']
post_data = json_data post_data = json_data
except (KeyError,JSONDecodeError): except (KeyError,JSONDecodeError):
post_data = request.POST q = request.POST
post_data = {k: q.getlist(k) if len(q.getlist(k))>1 else v for k, v in q.items()}
# only allow local host # only allow local host
hostt = request.get_host().split(':') hostt = request.get_host().split(':')