From 4d349816a5adfc9e7d1d72fd61edc6f2130a8db1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 20 Sep 2022 22:10:52 +0200 Subject: [PATCH] fixes --- rowers/tasks.py | 2 +- rowers/urls.py | 3 +++ rowers/views/workoutviews.py | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rowers/tasks.py b/rowers/tasks.py index f9c3e990..bff93d3e 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -3548,7 +3548,7 @@ def fetch_strava_workout(stravatoken, oauth_data, stravaid, csvfilename, userid, try: if 'summary_polyline' in workoutsummary['map'] and workouttype == 'rower': # pragma: no cover workouttype = 'water' - except KeyError: # pragma: no cover + except (KeyError,TypeError): # pragma: no cover pass try: diff --git a/rowers/urls.py b/rowers/urls.py index eef3a1e1..51364854 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -583,6 +583,9 @@ urlpatterns = [ re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/delete/$', login_required( views.WorkoutDelete.as_view()), name='workout_delete'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/delete/$', login_required( + views.WorkoutDelete.as_view()), + name='workout_delete'), re_path(r'^strava/webhooks/', views.strava_webhook_view, name='strava_webhook_view'), re_path(r'^garmin/summaries/', views.garmin_summaries_view, diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 2dd80ae6..d49c49bd 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -6737,7 +6737,10 @@ class WorkoutDelete(PermissionRequiredMixin, DeleteView): return reverse('workouts_view') def get_object(self, *args, **kwargs): - workout_pk = self.kwargs['pk'] + try: + workout_pk = self.kwargs['pk'] + except KeyError: + workout_pk = self.kwargs['id'] try: obj = Workout.objects.get(pk=workout_pk) except (ValueError, Workout.DoesNotExist):