Merge branch 'hotfix/v6.55'

rowers/utils.py

@@ -294,7 +294,10 @@ from datetime import date
 
 def calculate_age(born):
     today = date.today()
+    if born:
         return today.year - born.year - ((today.month, today.day) < (born.month, born.day))
+    else:
+        return None
 
 def my_dict_from_instance(instance,model):
     thedict = {}

rowers/views.py

@@ -13579,7 +13579,10 @@ def virtualevent_register_view(request,id=0):
                 age = cd['age']
             else:
                 weightcategory = r.weightcategory
+                if r.birthdate:
                     age = calculate_age(r.birthdate)
+                else:
+                    age = cd['age']
 
             record = VirtualRaceResult(
                 userid=r.id,