Merge branch 'release/v11.10'

rowers/uploads.py

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

rowers/views/workoutviews.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 
 import hashlib
 from shutil import copyfile
-
+from six import iterlists
 from rowers.views.statements import *
 import rowers.teams as teams
 import rowers.mytypes as mytypes
@@ -4405,7 +4405,8 @@ def workout_upload_api(request):
         secret = json_data['secret']
         post_data = json_data
     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
     hostt = request.get_host().split(':')