Merge branch 'release/v20.5.7'
This commit is contained in:
@@ -413,7 +413,7 @@ class DocumentsForm(forms.Form):
|
|||||||
label='Workout Type')
|
label='Workout Type')
|
||||||
|
|
||||||
boattype = forms.ChoiceField(required=True,
|
boattype = forms.ChoiceField(required=True,
|
||||||
choices=mytypes.boattypes,
|
choices=mytypes.boattypes+mytypes.ergtypes,
|
||||||
label="Boat Type")
|
label="Boat Type")
|
||||||
|
|
||||||
rpe = forms.ChoiceField(required=False,
|
rpe = forms.ChoiceField(required=False,
|
||||||
@@ -1168,7 +1168,7 @@ class StatsOptionsForm(forms.Form):
|
|||||||
initial=False, label='Include Rest Strokes', required=False)
|
initial=False, label='Include Rest Strokes', required=False)
|
||||||
|
|
||||||
water = forms.BooleanField(initial=False, required=False)
|
water = forms.BooleanField(initial=False, required=False)
|
||||||
waterboattype = forms.MultipleChoiceField(choices=boattypes,
|
waterboattype = forms.MultipleChoiceField(choices=boattypes+ergtypes,
|
||||||
label='Water Boat Type',
|
label='Water Boat Type',
|
||||||
widget=forms.CheckboxSelectMultiple(),
|
widget=forms.CheckboxSelectMultiple(),
|
||||||
initial=mytypes.waterboattype)
|
initial=mytypes.waterboattype)
|
||||||
|
|||||||
Reference in New Issue
Block a user