Remove invalid field data when 'together' fails

carltongibson · Oct 12, 2017 · 1b3bcf7 · 1b3bcf7
1 parent 157e08a
commit 1b3bcf7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/django_filters/filterset.py b/django_filters/filterset.py
@@ -74,7 +74,9 @@ def full_clean(form):
 
         for each in together:
             if not _together_valid(form, each):
-                return form.add_error(None, message % ','.join(each))
+                form.add_error(None, message % ','.join(each))
+                for field_name in each:
+                    form.cleaned_data.pop(field_name, None)
 
     return full_clean
 

diff --git a/tests/test_filterset.py b/tests/test_filterset.py
@@ -690,10 +690,15 @@ class Meta:
                 fields = ['username', 'status']
                 together = ['username', 'status']
 
+        # valid - neither field present, no filtering
         f = F({'username': '', 'status': ''}, queryset=self.qs)
+        self.assertTrue(f.is_valid())
         self.assertEqual(f.qs.count(), 2)
+
+        # invalid - both fields not present, no filtering
         f = F({'username': 'alex', 'status': ''}, queryset=self.qs)
-        self.assertEqual(f.qs.count(), 0)
+        self.assertFalse(f.is_valid())
+        self.assertEqual(f.qs.count(), 2)
 
 
 # test filter.method here, as it depends on its parent FilterSet