fixes

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:

rowers/urls.py

@@ -583,6 +583,9 @@ urlpatterns = [
     re_path(r'^workout/(?P<pk>\b[0-9A-Fa-f]+\b)/delete/$', login_required(
         views.WorkoutDelete.as_view()),
         name='workout_delete'),
+    re_path(r'^workout/(?P<id>\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,

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):