Merge pull request #56 from joehybird/master

Fixes for handling empty and multiple filter values.

Author: mgu

demo/demoproject/settings.py

@@ -1,4 +1,5 @@
 """Django settings for django-generic-filters demo project."""
+from os import environ
 from os.path import abspath, dirname, join
 
 
@@ -16,13 +17,16 @@
 
 # Database.
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': join(data_dir, 'db.sqlite'),
+    "default": {
+        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "NAME": "test",
+        "USER": environ.get("DJANGO_DB_USER", environ.get("USER")),
+        'PASSWORD': environ.get("DJANGO_DB_PASSWORD", ""),
+        'HOST': '',
+        'PORT': '',
     }
 }
 
-
 # Template.
 TEMPLATES = [
     {

django_genericfilters/forms.py

@@ -4,6 +4,8 @@
 and filtered queryset.
 
 """
+from six import string_types
+
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
@@ -66,6 +68,13 @@ def get_order_by_choices(self):
             _("Don't forget to implements get_order_by_choices"))
 
 
+def clean_yesno(value):
+    if isinstance(value, string_types):
+        return {"yes": True, "no": False}.get(value, value)
+
+    return value
+
+
 class FilteredForm(OrderFormMixin, QueryFormMixin, forms.Form):
     """
     FilteredForm is like a classic forms. But It use OrderFormMixin
@@ -74,8 +83,6 @@ class FilteredForm(OrderFormMixin, QueryFormMixin, forms.Form):
 
     def clean(self):
         data = self.cleaned_data
-        yesno = {"yes": True, "no": False}
-        update = {key: yesno.get(value, value)
-                  for key, value in data.items()}
+        update = {key: clean_yesno(value) for key, value in data.items()}
         data.update(update)
         return data