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

Merge branch 'release/v12.69'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-31 21:15:20 +02:00
parent a93cd1a8f5 4e24ed82ab
commit d8d3e72198
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rowers/models.py
View File

@@ -3086,31 +3086,31 @@ class IndoorVirtualRaceResultForm(ModelForm):
class Meta: class Meta:
model = IndoorVirtualRaceResult model = IndoorVirtualRaceResult
fields = ['teamname','weightcategory','boatclass','age','adaptiveclass', fields = ['teamname','weightcategory','boatclass','age','adaptiveclass',
#'entrycategory' 'entrycategory'
] ]
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
# categories = kwargs.pop('categories',None) categories = kwargs.pop('categories',None)
super(IndoorVirtualRaceResultForm, self).__init__(*args, **kwargs) super(IndoorVirtualRaceResultForm, self).__init__(*args, **kwargs)
# if categories is not None: if categories is not None:
# self.fields['entrycategory'].queryset = categories self.fields['entrycategory'].queryset = categories
# self.fields['entrycategory'].empty_label = None self.fields['entrycategory'].empty_label = None
# else: else:
# self.fields.pop('entrycategory') self.fields.pop('entrycategory')
class VirtualRaceResultForm(ModelForm): class VirtualRaceResultForm(ModelForm):
class Meta: class Meta:
model = VirtualRaceResult model = VirtualRaceResult
fields = ['teamname','weightcategory','boatclass','boattype', fields = ['teamname','weightcategory','boatclass','boattype',
'age','adaptiveclass', 'age','adaptiveclass',
#'entrycategory' 'entrycategory'
] ]
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
boattypes = kwargs.pop('boattypes',None) boattypes = kwargs.pop('boattypes',None)
# categories = kwargs.pop('categories',None) categories = kwargs.pop('categories',None)
super(VirtualRaceResultForm, self).__init__(*args, **kwargs) super(VirtualRaceResultForm, self).__init__(*args, **kwargs)
if boattypes: if boattypes:
@@ -3120,11 +3120,11 @@ class VirtualRaceResultForm(ModelForm):
required=False, required=False,
label='Mixed Gender') label='Mixed Gender')
# if categories is not None: if categories is not None:
# self.fields['entrycategory'].queryset = categories self.fields['entrycategory'].queryset = categories
# self.fields['entrycategory'].empty_label = None self.fields['entrycategory'].empty_label = None
# else: else:
# self.fields.pop('entrycategory') self.fields.pop('entrycategory')
from rowers.metrics import rowingmetrics from rowers.metrics import rowingmetrics