Merge pull request #122 from superosku/hotfix/121-fix-grouped-query-s…

…elect-multiple-field-validator Fix GroupedQuerySelectMultipleField validator
kvesteri · Aug 29, 2017 · 358333d · 358333d
2 parents 11e6e5c + 29418b9
commit 358333d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tests/test_query_select_field.py b/tests/test_query_select_field.py
@@ -348,6 +348,7 @@ def test_multiple_values_without_query_factory(self):
 
         form = MyForm(DummyPostData(cities=['1', '666']))
         form.cities.query = self.session.query(self.City)
+        assert not form.validate()
         assert [x.id for x in form.cities.data] == [1]
         assert not form.validate()
         form.populate_obj(obj)

diff --git a/wtforms_alchemy/fields.py b/wtforms_alchemy/fields.py
@@ -568,7 +568,7 @@ def process_formdata(self, valuelist):
         self._formdata = set(valuelist)
 
     def pre_validate(self, form):
-        if self._invalid_formdata:
+        if self.data and self._invalid_formdata:
             raise ValidationError(self.gettext('Not a valid choice'))
         elif self.data:
             obj_list = list(x[1] for x in self._get_object_list())