Merge branch 'release/v8.69'

rowers/models.py

@@ -2474,7 +2474,7 @@ class VirtualRaceResult(models.Model):
 # Virtual Race results (for keeping results when workouts are deleted)
 class IndoorVirtualRaceResult(models.Model):
     boatclasses = (type for type in mytypes.workouttypes if type[0] in mytypes.otetypes)
-    userid = models.IntegerField(default=0)
+    userid = models.IntegerField(default=0) # ID of rower object
     teamname = models.CharField(max_length=80,verbose_name = 'Team Name',
                                 blank=True,null=True)
     username = models.CharField(max_length=150)

rowers/views.py

@@ -10028,10 +10028,6 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
 
     row = get_workout(id)
 
-    if row.workouttype in mytypes.otetypes:
-        indoorraces = get_indoorraces(row)
-    else:
-        indoorraces = []
 
     if (checkworkoutuser(request.user,row)==False):
         raise PermissionDenied("Access denied")
@@ -10215,6 +10211,11 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
             
             ]
 
+    if row.workouttype in mytypes.otetypes:
+        indoorraces = get_indoorraces(row)
+    else:
+        indoorraces = []
+
     r = getrower(request.user)
     
     # render page
@@ -16185,11 +16186,11 @@ def virtualevent_disqualify_view(request,raceid=0,recordid=0):
             reason = form.cleaned_data['reason']
             disqualifier = disqualifiers[reason]
 
-            u = User.objects.get(id=record.userid)
+            r = Rower.objects.get(id=record.userid)
             name = record.username
 
             job = myqueue(queue,handle_send_disqualification_email,
-                          u.email, name,
+                          r.user.email, name,
                           disqualifier,message,race.name)
     
             messages.info(request,"We have invalidated the result for: "+str(record))