Merge branch 'hotfix/v10.25'

2019-09-22 10:34:06 +02:00
parent 53985f810e f729aaf952
commit d733409d3d
2 changed files with 5 additions and 2 deletions
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -1045,8 +1045,11 @@ class ConditionEditForm(ModelForm):

    def clean(self):
        cd = self.cleaned_data
-        if cd['condition'] == 'between' and cd['value2'] is None:
-            raise forms.ValidationError('When using between, you must fill value 1 and value 2')
+        try:
+            if cd['condition'] == 'between' and cd['value2'] is None:
+                raise forms.ValidationError('When using between, you must fill value 1 and value 2')
+        except KeyError:
+            pass

 class BaseConditionFormSet(BaseFormSet):
    def clean(self):
--- a/rowers/tests/testdata/testdata.csv.gz
+++ b/rowers/tests/testdata/testdata.csv.gz