From 9bbf02d9899189148a9c5bec676666d154f7d737 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 31 May 2020 20:54:49 +0200 Subject: [PATCH 1/2] last of models.py --- rowers/models.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 7a1d12a9..5e0ae86e 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -3091,13 +3091,13 @@ class IndoorVirtualRaceResultForm(ModelForm): def __init__(self, *args, **kwargs): -# categories = kwargs.pop('categories',None) + categories = kwargs.pop('categories',None) super(IndoorVirtualRaceResultForm, self).__init__(*args, **kwargs) -# if categories is not None: -# self.fields['entrycategory'].queryset = categories -# self.fields['entrycategory'].empty_label = None -# else: -# self.fields.pop('entrycategory') + if categories is not None: + self.fields['entrycategory'].queryset = categories + self.fields['entrycategory'].empty_label = None + else: + self.fields.pop('entrycategory') class VirtualRaceResultForm(ModelForm): class Meta: @@ -3110,7 +3110,7 @@ class VirtualRaceResultForm(ModelForm): def __init__(self, *args, **kwargs): boattypes = kwargs.pop('boattypes',None) -# categories = kwargs.pop('categories',None) + categories = kwargs.pop('categories',None) super(VirtualRaceResultForm, self).__init__(*args, **kwargs) if boattypes: @@ -3120,11 +3120,11 @@ class VirtualRaceResultForm(ModelForm): required=False, label='Mixed Gender') -# if categories is not None: -# self.fields['entrycategory'].queryset = categories -# self.fields['entrycategory'].empty_label = None -# else: -# self.fields.pop('entrycategory') + if categories is not None: + self.fields['entrycategory'].queryset = categories + self.fields['entrycategory'].empty_label = None + else: + self.fields.pop('entrycategory') from rowers.metrics import rowingmetrics From 4e24ed82abd3df1f6144dc011cc729523690fca9 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 31 May 2020 21:15:08 +0200 Subject: [PATCH 2/2] bug fix --- rowers/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 5e0ae86e..3fea4dbb 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -3086,7 +3086,7 @@ class IndoorVirtualRaceResultForm(ModelForm): class Meta: model = IndoorVirtualRaceResult fields = ['teamname','weightcategory','boatclass','age','adaptiveclass', - #'entrycategory' + 'entrycategory' ] @@ -3104,7 +3104,7 @@ class VirtualRaceResultForm(ModelForm): model = VirtualRaceResult fields = ['teamname','weightcategory','boatclass','boattype', 'age','adaptiveclass', - #'entrycategory' + 'entrycategory' ]