Merge branch 'release/v8.60'

rowers/management/commands/getexpired.py

@@ -20,10 +20,10 @@ def getexpired():
     lijst = []
     for r in rs:
         if r.planexpires < datetime.datetime.now().date():
-            if r.rowerplan == 'pro' or r.rowerplan == 'coach':
+            if r.rowerplan == 'pro' or r.rowerplan == 'coach' or r.rowerplan == 'plan':
                 lijst.append(r)
         if r.teamplanexpires < datetime.datetime.now().date():
-            if r.rowerplan == 'pro' or r.rowerplan == 'coach':
+            if r.rowerplan == 'pro' or r.rowerplan == 'coach' or r.rowerplan == 'plan':
                 lijst.append(r)
     return lijst
 

rowers/plannedsessions.py

@@ -798,7 +798,12 @@ def race_can_adddiscipline(r,race):
     
 
 def race_can_withdraw(r,race):
-    records = VirtualRaceResult.objects.filter(
+    if race.sessiontype == 'race':
+        recordobj = VirtualRaceResult
+    else:
+        recordobj = IndoorVirtualRaceResult
+        
+    records = recordobj.objects.filter(
         userid=r.id,
         race=race
         )

rowers/views.py

@@ -16124,6 +16124,7 @@ def virtualevent_view(request,id=0):
 @login_required()
 def virtualevent_withdraw_view(request,id=0,recordid=None):
     r = getrower(request.user)
+
     try:
         race = VirtualRace.objects.get(id=id)
     except VirtualRace.DoesNotExist: