From f00d5f4270496ad88c400d57c84851b8f589f84d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 19 Feb 2020 17:16:09 +0100 Subject: [PATCH 1/2] more quick fixes --- rowers/uploads.py | 6 +++++- rowers/views/workoutviews.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rowers/uploads.py b/rowers/uploads.py index b09c57d8..275f9e1d 100644 --- a/rowers/uploads.py +++ b/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'] diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 38c6d90a..61baaed8 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -4405,7 +4405,7 @@ def workout_upload_api(request): secret = json_data['secret'] post_data = json_data except (KeyError,JSONDecodeError): - post_data = request.POST + post_data = dict(request.POST.iterlists()) # only allow local host hostt = request.get_host().split(':') From 4b9e4ee0e1befd7c92713c9cd35902453902cf02 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 19 Feb 2020 17:28:22 +0100 Subject: [PATCH 2/2] fixing more fixes --- rowers/uploads.py | 2 +- rowers/views/workoutviews.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rowers/uploads.py b/rowers/uploads.py index 275f9e1d..258a4d51 100644 --- a/rowers/uploads.py +++ b/rowers/uploads.py @@ -512,7 +512,7 @@ def do_sync(w,options): 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'] diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 61baaed8..861320de 100644 --- a/rowers/views/workoutviews.py +++ b/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 = dict(request.POST.iterlists()) + 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(':')