sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'hotfix/v6.55'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-04-27 09:32:19 +02:00
parent 0a72e1961f 3ba9bbf93a
commit b47ddb71d4
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/utils.py
+4 -1
View File
@@ -294,7 +294,10 @@ from datetime import date
def calculate_age(born): def calculate_age(born):
today = date.today() today = date.today()
return today.year - born.year - ((today.month, today.day) < (born.month, born.day)) 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): def my_dict_from_instance(instance,model):
thedict = {} thedict = {}
rowers/views.py
+4 -1
View File
@@ -13579,7 +13579,10 @@ def virtualevent_register_view(request,id=0):
age = cd['age'] age = cd['age']
else: else:
weightcategory = r.weightcategory weightcategory = r.weightcategory
age = calculate_age(r.birthdate) if r.birthdate:
age = calculate_age(r.birthdate)
else:
age = cd['age']
record = VirtualRaceResult( record = VirtualRaceResult(
userid=r.id, userid=r.id,