Merge branch 'release/v22.6.10'

rowers/integrations/intervals.py

@@ -582,9 +582,10 @@ class IntervalsIntegration(SyncIntegration):
         try:
             id = record['id']
             try:
-                w = Workout.objects.get(uploadedtointervals=id)
+                ws = Workout.objects.filter(uploadedtointervals=id)
                 if w.user == self.rower:
-                    w.delete()
+                    for w in ws:
+                        w.delete()
             except Workout.DoesNotExist:
                 pass
         except KeyError:

rowers/mytypes.py

@@ -534,6 +534,7 @@ sexcategories = (
 )
 
 waterboattype = [i[0] for i in boattypes]
+ergtype = [i[0] for i in ergtypes]
 
 privacychoices = (
     ('private', 'Private'),

rowers/views/workoutviews.py

@@ -1134,7 +1134,7 @@ def workouts_join_select(request,
     if 'waterboattype' in request.session:
         waterboattype = request.session['waterboattype']
     else:
-        waterboattype = mytypes.waterboattype
+        waterboattype = mytypes.waterboattype+mytypes.ergtype 
 
     if 'modalities' in request.session:
         modalities = request.session['modalities']