django-searchkit 1.0__py3-none-any.whl → 1.2__py3-none-any.whl

build/lib/searchkit/tests.py

@@ -1,19 +1,29 @@
+from urllib.parse import urlencode
 from django.test import TestCase
 from django.contrib.contenttypes.models import ContentType
-from django import forms
+from django.contrib.auth.models import User
+from django.urls import reverse
 from example.models import ModelA
+from example.management.commands.createtestdata import Command as CreateTestData
 from searchkit.forms.utils import FIELD_PLAN
 from searchkit.forms.utils import SUPPORTED_FIELDS
-from searchkit.forms.utils import SUPPORTED_RELATIONS
-from searchkit.forms import SearchkitSearchForm
-from searchkit.forms import SearchkitForm
-from searchkit.forms import SearchkitFormSet
+from searchkit.forms.utils import ModelTree
+from searchkit.forms import SearchForm
+from searchkit.forms import SearchkitModelForm
+from searchkit.forms import BaseSearchkitFormSet
+from searchkit.forms import searchkit_formset_factory
+from searchkit.models import Search
+from searchkit import __version__
+
+
+SearchkitFormSet = searchkit_formset_factory(model=ModelA)
+SearchkitForm = SearchkitFormSet.form
 
 
 INITIAL_DATA = [
     dict(
         field='model_b__chars',
-        operator='exact',
+        operator='contains',
         value='anytext',
     ),
     dict(
@@ -23,12 +33,12 @@ INITIAL_DATA = [
     ),
     dict(
         field='float',
-        operator='exact',
+        operator='gt',
         value='0.3',
     ),
     dict(
         field='decimal',
-        operator='exact',
+        operator='lte',
         value='1.23',
     ),
     dict(
@@ -43,20 +53,29 @@ INITIAL_DATA = [
     )
 ]
 
-add_prefix = lambda i: SearchkitFormSet(model=ModelA).add_prefix(i)
+add_prefix = lambda i: SearchkitFormSet().add_prefix(i)
+contenttype = ContentType.objects.get_for_model(ModelA)
 DEFAULT_PREFIX = SearchkitFormSet.get_default_prefix()
-FORM_DATA = {
-    'name': 'test search',                  # The name of the search.
-    f'{DEFAULT_PREFIX}-TOTAL_FORMS': '6',   # Data for the managment form.
-    f'{DEFAULT_PREFIX}-INITIAL_FORMS': '1', # Data for the managment form.
-    f'{DEFAULT_PREFIX}-contenttype': f'{ContentType.objects.get_for_model(ModelA).pk}',
-    f'{add_prefix(1)}-value_0': '1',        # Data for the range operator.
-    f'{add_prefix(1)}-value_1': '123',      # Data for the range operator.
-}
-for i, data in enumerate(INITIAL_DATA, 0):
-    prefix = SearchkitFormSet(model=ModelA).add_prefix(i)
-    for key, value in data.items():
-        FORM_DATA.update({f'{prefix}-{key}': value})
+
+def get_form_data(initial_data=INITIAL_DATA):
+    count = len(initial_data)
+    data = {
+        'name': 'test search',                  # The name of the search.
+        'searchkit_model': f'{contenttype.pk}',  # Data for the searchkit-model form.
+        f'{DEFAULT_PREFIX}-TOTAL_FORMS': f'{count}',   # Data for the managment form.
+        f'{DEFAULT_PREFIX}-INITIAL_FORMS': f'{count}', # Data for the managment form.
+    }
+    for i, d in enumerate(initial_data):
+        prefix = SearchkitFormSet().add_prefix(i)
+        for key, value in d.items():
+            if isinstance(value, list):
+                for i, v in enumerate(value):
+                    data.update({f'{prefix}-{key}_{i}': v})
+            else:
+                data.update({f'{prefix}-{key}': value})
+    return data
+
+FORM_DATA = get_form_data()
 
 
 class CheckFormMixin:
@@ -70,22 +89,19 @@ class CheckFormMixin:
         self.assertIn('value', form.fields)
         self.assertEqual(len(form.fields), 3)
 
-        # Check choices of the model_field.
+        # Check field choices for the model.
         form_model_field = form.fields['field']
         self.assertTrue(form_model_field.choices)
         options = [c[0] for c in form_model_field.choices]
-        for model_field in ModelA._meta.fields:
-            if isinstance(model_field, tuple(SUPPORTED_FIELDS)):
-                self.assertIn(model_field.name, options)
-
-        # Check choices for relational lookups.
-        for model_field in ModelA._meta.fields:
-            if isinstance(model_field, tuple(SUPPORTED_RELATIONS)):
-                remote_fields = model_field.remote_field.model._meta.fields
-                for remote_field in remote_fields:
-                    if isinstance(model_field, tuple(SUPPORTED_FIELDS)):
-                        lookup_path = f'{model_field.name}__{remote_field.name}'
-                        self.assertIn(lookup_path, options)
+        tree = ModelTree(ModelA)
+        for node in tree.iterate():
+            for model_field in node.model._meta.fields:
+                if not any(isinstance(model_field, f) for f in SUPPORTED_FIELDS):
+                    continue
+                if node.is_root:
+                    self.assertIn(model_field.name, options)
+                else:
+                    self.assertIn(f'{node.field_path}__{model_field.name}', options)
 
         # Check the field_plan choosen based on the model_field.
         field_plan = next(iter([p for t, p in FIELD_PLAN.items() if t(form.model_field)]))
@@ -102,7 +118,7 @@ class CheckFormMixin:
 class SearchkitFormTestCase(CheckFormMixin, TestCase):
 
     def test_blank_searchkitform(self):
-        form = SearchkitForm(ModelA, prefix=add_prefix(0))
+        form = SearchkitForm(prefix=add_prefix(0))
         self.check_form(form)
 
         # Form should not be bound or valid.
@@ -113,7 +129,7 @@ class SearchkitFormTestCase(CheckFormMixin, TestCase):
         data = {
             f'{add_prefix(0)}-field': 'foobar',
         }
-        form = SearchkitForm(ModelA, data, prefix=add_prefix(0))
+        form = SearchkitForm(data, prefix=add_prefix(0))
         self.check_form(form)
 
         # Form should be invalid.
@@ -127,7 +143,7 @@ class SearchkitFormTestCase(CheckFormMixin, TestCase):
         data = {
             f'{add_prefix(0)}-field': 'integer',
         }
-        form = SearchkitForm(ModelA, data, prefix=add_prefix(0))
+        form = SearchkitForm(data, prefix=add_prefix(0))
         self.check_form(form)
 
         # Form should be invalid since no value data is provieded.
@@ -138,7 +154,7 @@ class SearchkitFormTestCase(CheckFormMixin, TestCase):
             f'{add_prefix(0)}-field': 'integer',
             f'{add_prefix(0)}-operator': 'foobar',
         }
-        form = SearchkitForm(ModelA, data, prefix=add_prefix(0))
+        form = SearchkitForm(data, prefix=add_prefix(0))
         self.check_form(form)
 
         # Form should be invalid.
@@ -153,7 +169,7 @@ class SearchkitFormTestCase(CheckFormMixin, TestCase):
             f'{add_prefix(0)}-field': 'integer',
             f'{add_prefix(0)}-operator': 'exact',
         }
-        form = SearchkitForm(ModelA, data, prefix=add_prefix(0))
+        form = SearchkitForm(data, prefix=add_prefix(0))
         self.check_form(form)
 
         # Form should be invalid since no value data is provieded.
@@ -165,7 +181,7 @@ class SearchkitFormTestCase(CheckFormMixin, TestCase):
             f'{add_prefix(0)}-operator': 'exact',
             f'{add_prefix(0)}-value': '123',
         }
-        form = SearchkitForm(ModelA, data, prefix=add_prefix(0))
+        form = SearchkitForm(data, prefix=add_prefix(0))
         self.check_form(form)
 
         # Form should be valid.
@@ -177,7 +193,7 @@ class SearchkitFormTestCase(CheckFormMixin, TestCase):
             f'{add_prefix(0)}-operator': 'exact',
             f'{add_prefix(0)}-value': 'foobar',
         }
-        form = SearchkitForm(ModelA, data, prefix=add_prefix(0))
+        form = SearchkitForm(data, prefix=add_prefix(0))
         self.check_form(form)
 
         # Form should be invalid.
@@ -204,7 +220,7 @@ class SearchkitFormSetTestCase(CheckFormMixin, TestCase):
     def test_searchkit_formset_with_invalid_data(self):
         data = FORM_DATA.copy()
         del data[f'{add_prefix(0)}-value']
-        formset = SearchkitFormSet(data, model=ModelA)
+        formset = SearchkitFormSet(data)
         self.assertFalse(formset.is_valid())
 
         # Check error message in html.
@@ -212,7 +228,8 @@ class SearchkitFormSetTestCase(CheckFormMixin, TestCase):
         self.assertIn(errors, formset.forms[0].errors.values())
 
     def test_searchkit_formset_with_initial_data(self):
-        formset = SearchkitFormSet(initial=INITIAL_DATA, model=ModelA)
+        formset_class = searchkit_formset_factory(model=ModelA, extra=0)
+        formset = formset_class(initial=INITIAL_DATA)
         self.assertFalse(formset.is_bound)
         self.assertFalse(formset.is_valid())
         self.assertEqual(len(formset.forms), len(INITIAL_DATA))
@@ -223,17 +240,17 @@ class SearchkitFormSetTestCase(CheckFormMixin, TestCase):
 
 class SearchkitSearchFormTestCase(TestCase):
     def test_searchkit_search_form_without_data(self):
-        form = SearchkitSearchForm()
+        form = SearchForm()
         self.assertFalse(form.is_bound)
         self.assertFalse(form.is_valid())
-        self.assertIsInstance(form.formset, SearchkitFormSet)
+        self.assertIsInstance(form.formset, BaseSearchkitFormSet)
         self.assertEqual(form.formset.model, None)
 
     def test_searchkit_search_form_with_data(self):
-        form = SearchkitSearchForm(FORM_DATA)
+        form = SearchForm(FORM_DATA)
         self.assertTrue(form.is_bound)
         self.assertTrue(form.is_valid())
-        self.assertIsInstance(form.formset, SearchkitFormSet)
+        self.assertIsInstance(form.formset, BaseSearchkitFormSet)
         self.assertEqual(form.formset.model, ModelA)
         self.assertEqual(form.instance.data, form.formset.cleaned_data)
 
@@ -242,9 +259,142 @@ class SearchkitSearchFormTestCase(TestCase):
         self.assertTrue(form.instance.pk)
 
         # Using the instance data as filter rules works.
-        filter_rules = form.instance.get_filter_rules()
+        filter_rules = form.instance.as_lookups()
         self.assertEqual(len(filter_rules), len(INITIAL_DATA))
         for data in INITIAL_DATA:
             self.assertIn(f"{data['field']}__{data['operator']}", filter_rules)
-        queryset = form.formset.model.objects.filter(**filter_rules)
-        self.assertTrue(queryset.model == ModelA)
+
+
+class SearchkitModelFormTestCase(TestCase):
+    def test_searchkit_model_form_choices(self):
+        form = SearchkitModelForm()
+        labels = [c[1] for c in form.fields['searchkit_model'].choices]
+        self.assertEqual(len(labels), 3)
+        self.assertEqual('select a model', labels[0].lower())
+        self.assertEqual('example | model a', labels[1].lower())
+        self.assertEqual('example | model b', labels[2].lower())
+
+
+class AdminBackendTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        CreateTestData().handle()
+
+    def setUp(self):
+        admin = User.objects.get(username='admin')
+        self.client.force_login(admin)
+
+    def test_search_form(self):
+        url = reverse('admin:searchkit_search_add')
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        select = b'<select name="searchkit_model" class="searchkit-reload-on-change" data-total-forms="1" required id="id_searchkit_model">'
+        for snippet in select.split(b' '):
+            self.assertIn(snippet, resp.content)
+
+    def test_search_form_with_initial(self):
+        url = reverse('admin:searchkit_search_add') + '?searchkit_model=1'
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        select = '<select name="searchkit_model" class="searchkit-reload-on-change" data-total-forms="1" required id="id_searchkit_model">'
+        for snippet in select.split(' '):
+            self.assertIn(snippet, str(resp.content))
+        self.assertIn('<option value="1" selected>', str(resp.content))
+        self.assertIn('name="searchkit-example-modela-0-field"', str(resp.content))
+
+    def test_add_search(self):
+        # Create a search object via the admin backend.
+        url = reverse('admin:searchkit_search_add')
+        data = FORM_DATA.copy()
+        data['_save_and_apply'] = True
+        resp = self.client.post(url, data, follow=True)
+        self.assertEqual(resp.status_code, 200)
+        self.assertEqual(len(Search.objects.all()), 1)
+
+        # Change it via backend.
+        url = reverse('admin:searchkit_search_change', args=(1,))
+        data['name'] = 'Changed name'
+        data['searchkit-example-modela-0-field'] = 'boolean'
+        data['searchkit-example-modela-0-operator'] = 'exact'
+        data['searchkit-example-modela-0-value'] = 'true'
+        resp = self.client.post(url, data, follow=True)
+        self.assertEqual(resp.status_code, 200)
+        self.assertEqual(Search.objects.get(pk=1).name, data['name'])
+
+        # Will the search be listed in the admin filter?
+        url = reverse('admin:example_modela_changelist')
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        self.assertIn('href="?search=1"', str(resp.content))
+        self.assertIn(data['name'], str(resp.content))
+
+
+class SearchViewTest(TestCase):
+
+    def setUp(self):
+        self.initial = [
+            dict(
+                field='integer',
+                operator='exact',
+                value=1,
+            )
+        ]
+        self.initial_range = [
+            dict(
+                field='integer',
+                operator='range',
+                value=[1,3],
+            )
+        ]
+
+    def test_search_view_invalid_data(self):
+        initial = self.initial.copy()
+        initial[0]['value'] = 'no integer'
+        data = get_form_data(initial)
+        url_params = urlencode(data)
+        base_url = reverse('searchkit_form')
+        url = f'{base_url}?{url_params}'
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        html_error = '<li>Enter a whole number.</li>'
+        self.assertInHTML(html_error, str(resp.content))
+
+    def test_search_view_missing_data(self):
+        initial = self.initial.copy()
+        del(initial[0]['value'])
+        data = get_form_data(initial)
+        url_params = urlencode(data)
+        base_url = reverse('searchkit_form')
+        url = f'{base_url}?{url_params}'
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        html_error = '<li>This field is required.</li>'
+        self.assertInHTML(html_error, str(resp.content))
+
+    def test_search_view_with_range_operator(self):
+        data = get_form_data(self.initial_range)
+        url_params = urlencode(data)
+        base_url = reverse('searchkit_form')
+        url = f'{base_url}?{url_params}'
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+        html = '<input type="number" name="searchkit-example-modela-0-value_1" value="3" id="id_searchkit-example-modela-0-value_1">'
+        self.assertInHTML(html, str(resp.content))
+
+    def test_search_view_with_model(self):
+        data = get_form_data(self.initial)
+        data['searchkit_model'] = ContentType.objects.get_for_model(ModelA).pk
+        url_params = urlencode(data)
+        base_url = reverse('searchkit_form')
+        url = f'{base_url}?{url_params}'
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 200)
+
+    def test_search_view_with_invalid_model(self):
+        data = get_form_data(self.initial)
+        data['searchkit_model'] = 9999  # Non-existing content type.
+        url_params = urlencode(data)
+        base_url = reverse('searchkit_form')
+        url = f'{base_url}?{url_params}'
+        resp = self.client.get(url)
+        self.assertEqual(resp.status_code, 400)

build/lib/searchkit/urls.py

@@ -3,6 +3,5 @@ from .views import SearchkitAjaxView
 
 
 urlpatterns = [
-    path("searchkit/form/", SearchkitAjaxView.as_view(), name="searchkit_form"),
-    path("searchkit/form/<slug:app_label>/<slug:model_name>/", SearchkitAjaxView.as_view(), name="searchkit_form_model"),
+    path("searchkit/", SearchkitAjaxView.as_view(), name="searchkit_form"),
 ]

build/lib/searchkit/views.py

@@ -1,9 +1,11 @@
 from django.utils.translation import gettext_lazy as _
 from django.http import HttpResponse
-from django.http import Http404
+from django.http import Http404, HttpResponseBadRequest
 from django.apps import apps
+from django.contrib.contenttypes.models import ContentType
 from django.views.generic import View
-from .forms import SearchkitFormSet
+from .forms import SearchkitModelForm
+from .forms import searchkit_formset_factory
 
 
 # FIXME: Check permissions and authentication.
@@ -11,20 +13,11 @@ class SearchkitAjaxView(View):
     """
     Reload the formset via ajax.
     """
-    def get_model(self, **kwargs):
-        """
-        Get the model from the URL parameters.
-        """
-        if all(k in kwargs for k in ('app_label', 'model_name')):
-            app_label, model_name = kwargs['app_label'], kwargs['model_name']
-            try:
-                return apps.get_model(app_label=app_label, model_name=model_name)
-            except LookupError:
-                raise Http404(_('Model %s.%s not found') % (app_label, model_name))
-        else:
-            return None
-
     def get(self, request, **kwargs):
-        model = self.get_model(**kwargs)
-        formset = SearchkitFormSet(data=request.GET, model=model)
-        return HttpResponse(formset.render())
+        model_form = SearchkitModelForm(data=self.request.GET)
+        if model_form.is_valid():
+            model = model_form.cleaned_data['searchkit_model'].model_class()
+            formset = searchkit_formset_factory(model=model)(data=request.GET)
+            return HttpResponse(formset.render())
+        else:
+            return HttpResponseBadRequest(_('Invalid searchkit-model-form.'))

{django_searchkit-1.0.dist-info → django_searchkit-1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-searchkit
-Version: 1.0
+Version: 1.2
 Summary: Finally a real searchkit for django!
 Home-page: https://github.com/thomst/django-searchkit
 Author: Thomas Leichtfuß
@@ -9,8 +9,6 @@ License: BSD License
 Platform: OS Independent
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.1
-Classifier: Framework :: Django :: 3.2
 Classifier: Framework :: Django :: 4.0
 Classifier: Framework :: Django :: 4.1
 Classifier: Framework :: Django :: 4.2
@@ -22,8 +20,6 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -32,8 +28,9 @@ Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Description-Content-Type: text/markdown
 License-File: LICENCE
-Requires-Dist: Django>=3.1
+Requires-Dist: Django>=4.0
 Requires-Dist: django-picklefield>=2.0
+Requires-Dist: django-modeltree
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -50,8 +47,8 @@ Dynamic: summary
 
 [<img src="https://github.com/thomst/django-searchkit/actions/workflows/ci.yml/badge.svg">](https://github.com/thomst/django-searchkit/)
 [<img src="https://coveralls.io/repos/github/thomst/django-searchkit/badge.svg?branch=main">](https://coveralls.io/github/thomst/django-searchkit?branch=main)
-[<img src="https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue">](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11-blue)
-[<img src="https://img.shields.io/badge/django-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange">](https://img.shields.io/badge/django-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange)
+[<img src="https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11-blue">](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11-blue)
+[<img src="https://img.shields.io/badge/django-4.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange">](https://img.shields.io/badge/django-4.0%20%7C%204.1%20%7C%204.2%20%7C%205.0%20%7C%205.1%20%7C%205.2-orange)
 
 
 ## Description
@@ -99,20 +96,8 @@ class MyModelAdmin(admin.ModelAdmin):
 ## Usage
 
 1. Open the admin changelist of your Model.
-2. Click "Add filter" on the Searchkit filter.
-3. Choose the Model you want to filter.
+2. Click the "Add filter" button of the Searchkit filter.
+3. Give your Filter a name.
 4. Configure as many filter rules as you want.
-5. Click "Save and apply"
-
-
-## TODO
-
-- Limit the choices of the model field by models that should be searchable.
-- Add an apply button to the search edit page to be able to use a search without
-  saving it.
-- Coming from the search edit page the filtering should be done by an id__in url
-  parameter, not by an search parameter as it is used by the searchkit filter.
-- Preselect the right model in the model field when coming from a models
-  changelist by the "Add filter" button.
-- Add a public field for searches and only offer public searches in the
-  searchkit filter.
+5. Click "Save and apply".
+6. Reuse your filter whenever you want using the Searchkit filter section.

django_searchkit-1.2.dist-info/RECORD

@@ -0,0 +1,130 @@
+build/lib/build/lib/build/lib/example/example/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/build/lib/example/example/admin.py,sha256=eTZ5mCA1ToGouqYgIf-6xDl2nvYAz7T9lU1Bnu_gP9c,462
+build/lib/build/lib/build/lib/example/example/asgi.py,sha256=mqLnzcCH9X-8UhDo5ZhcM8tF3jtALEGSjsBmphbkLcs,391
+build/lib/build/lib/build/lib/example/example/models.py,sha256=fB9X782cX01Yg2uIiPCVgrS8C7DkgG9U-9mxGtX3P7Q,1097
+build/lib/build/lib/build/lib/example/example/settings.py,sha256=du9bWbAceSvDkYeNYOc_3KxKL1p1se93TdAueT2RQ_E,3256
+build/lib/build/lib/build/lib/example/example/urls.py,sha256=D8LxjiTdJSA87AVh3BzpVo5E2aC30hlp20HshPDrfvU,800
+build/lib/build/lib/build/lib/example/example/wsgi.py,sha256=OAXHHeNQoj7FBDc5NMET39i_kIGpFrcdNDdY1thrh58,391
+build/lib/build/lib/build/lib/example/example/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/build/lib/example/example/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/build/lib/example/example/management/commands/createtestdata.py,sha256=IVtyUqak133h9Ua-Ag_GP8mw3dUdiDYAa2tGmLkKluU,2737
+build/lib/build/lib/build/lib/example/example/migrations/0001_initial.py,sha256=62tOi17oHGuqqLmSAYWLep6AMkxCJF6Tp13odghS7gI,2014
+build/lib/build/lib/build/lib/example/example/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/build/lib/searchkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/build/lib/searchkit/__version__.py,sha256=g6zhPyD9UelvcYrhtmQjIk-7_RH9Bu2W8YLlyW3M5OM,661
+build/lib/build/lib/build/lib/searchkit/admin.py,sha256=URZgMKnfKlDqOgmQXJHu7mFGrjwkElpunAUbp2_9JcA,1182
+build/lib/build/lib/build/lib/searchkit/apps.py,sha256=17m6wPu5N59Dq4MLoWaQd0aNHEzMT4z4emQD632GIMA,150
+build/lib/build/lib/build/lib/searchkit/filters.py,sha256=l8756ftyURUpK3KSkl__TDP5KpqaapxjYMaAjh729ps,1098
+build/lib/build/lib/build/lib/searchkit/models.py,sha256=0LEe0z3jOTqAGrqNGknDDY1L1anaG3kCcQ_Zm_7dl9I,800
+build/lib/build/lib/build/lib/searchkit/tests.py,sha256=qm8rvKC8aDnaspIXwzCsDwMkfXMR4uOHzqDLWhdv2dA,14849
+build/lib/build/lib/build/lib/searchkit/urls.py,sha256=Mhrq4CUOhrh28ZhRocSP2AYnfWFW2c_eJyMR81q5fps,162
+build/lib/build/lib/build/lib/searchkit/views.py,sha256=ECSwsge2pD0OJLHdHwpOdWS7XiItUX2NFCO8FSjBigE,919
+build/lib/build/lib/build/lib/searchkit/forms/__init__.py,sha256=FBggDa1owkYrceIU3cqNhqsMB49RJWZRAkA4OfvUMcM,207
+build/lib/build/lib/build/lib/searchkit/forms/fields.py,sha256=TpFZdAyWKaMhOoZFTuy5ODNrW6RLy289Lk1fcMSGJ20,1621
+build/lib/build/lib/build/lib/searchkit/forms/search.py,sha256=mca67piLDqKUhXzaKIOztk5Gg8V1XL21n27aIffH88A,2330
+build/lib/build/lib/build/lib/searchkit/forms/searchkit.py,sha256=pg3vw6dMdtaHja-g1Yh72XJkLp7I48nXht9zxWbGW9Y,6022
+build/lib/build/lib/build/lib/searchkit/forms/utils.py,sha256=m8vwB-3AoYuMx0QxlJTwSWbDHBG8MyCxFmsyK6xyai8,5221
+build/lib/build/lib/build/lib/searchkit/migrations/0001_initial.py,sha256=cP886X1UMrDTf-KxfHfuoQ4b1T1lhdNJyVNOGMNyWNw,1093
+build/lib/build/lib/build/lib/searchkit/migrations/0002_rename_searchkitsearch_search.py,sha256=RHXShizf689AdPb2Ca-hONWmwZbB2Fs5DQhXlEPE-f0,389
+build/lib/build/lib/build/lib/searchkit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/build/lib/searchkit/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/build/lib/searchkit/templatetags/searchkit.py,sha256=HpEGTGYi_enDh_bgTgWdVbZftNuZqRt4J9N5A0Nc1AM,581
+build/lib/build/lib/example/example/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/example/example/admin.py,sha256=eTZ5mCA1ToGouqYgIf-6xDl2nvYAz7T9lU1Bnu_gP9c,462
+build/lib/build/lib/example/example/asgi.py,sha256=mqLnzcCH9X-8UhDo5ZhcM8tF3jtALEGSjsBmphbkLcs,391
+build/lib/build/lib/example/example/models.py,sha256=fB9X782cX01Yg2uIiPCVgrS8C7DkgG9U-9mxGtX3P7Q,1097
+build/lib/build/lib/example/example/settings.py,sha256=du9bWbAceSvDkYeNYOc_3KxKL1p1se93TdAueT2RQ_E,3256
+build/lib/build/lib/example/example/urls.py,sha256=D8LxjiTdJSA87AVh3BzpVo5E2aC30hlp20HshPDrfvU,800
+build/lib/build/lib/example/example/wsgi.py,sha256=OAXHHeNQoj7FBDc5NMET39i_kIGpFrcdNDdY1thrh58,391
+build/lib/build/lib/example/example/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/example/example/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/example/example/management/commands/createtestdata.py,sha256=IVtyUqak133h9Ua-Ag_GP8mw3dUdiDYAa2tGmLkKluU,2737
+build/lib/build/lib/example/example/migrations/0001_initial.py,sha256=62tOi17oHGuqqLmSAYWLep6AMkxCJF6Tp13odghS7gI,2014
+build/lib/build/lib/example/example/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/searchkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/searchkit/__version__.py,sha256=g6zhPyD9UelvcYrhtmQjIk-7_RH9Bu2W8YLlyW3M5OM,661
+build/lib/build/lib/searchkit/admin.py,sha256=URZgMKnfKlDqOgmQXJHu7mFGrjwkElpunAUbp2_9JcA,1182
+build/lib/build/lib/searchkit/apps.py,sha256=17m6wPu5N59Dq4MLoWaQd0aNHEzMT4z4emQD632GIMA,150
+build/lib/build/lib/searchkit/filters.py,sha256=l8756ftyURUpK3KSkl__TDP5KpqaapxjYMaAjh729ps,1098
+build/lib/build/lib/searchkit/models.py,sha256=0LEe0z3jOTqAGrqNGknDDY1L1anaG3kCcQ_Zm_7dl9I,800
+build/lib/build/lib/searchkit/tests.py,sha256=qm8rvKC8aDnaspIXwzCsDwMkfXMR4uOHzqDLWhdv2dA,14849
+build/lib/build/lib/searchkit/urls.py,sha256=Mhrq4CUOhrh28ZhRocSP2AYnfWFW2c_eJyMR81q5fps,162
+build/lib/build/lib/searchkit/views.py,sha256=ECSwsge2pD0OJLHdHwpOdWS7XiItUX2NFCO8FSjBigE,919
+build/lib/build/lib/searchkit/forms/__init__.py,sha256=FBggDa1owkYrceIU3cqNhqsMB49RJWZRAkA4OfvUMcM,207
+build/lib/build/lib/searchkit/forms/fields.py,sha256=TpFZdAyWKaMhOoZFTuy5ODNrW6RLy289Lk1fcMSGJ20,1621
+build/lib/build/lib/searchkit/forms/search.py,sha256=mca67piLDqKUhXzaKIOztk5Gg8V1XL21n27aIffH88A,2330
+build/lib/build/lib/searchkit/forms/searchkit.py,sha256=pg3vw6dMdtaHja-g1Yh72XJkLp7I48nXht9zxWbGW9Y,6022
+build/lib/build/lib/searchkit/forms/utils.py,sha256=m8vwB-3AoYuMx0QxlJTwSWbDHBG8MyCxFmsyK6xyai8,5221
+build/lib/build/lib/searchkit/migrations/0001_initial.py,sha256=cP886X1UMrDTf-KxfHfuoQ4b1T1lhdNJyVNOGMNyWNw,1093
+build/lib/build/lib/searchkit/migrations/0002_rename_searchkitsearch_search.py,sha256=RHXShizf689AdPb2Ca-hONWmwZbB2Fs5DQhXlEPE-f0,389
+build/lib/build/lib/searchkit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/searchkit/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/build/lib/searchkit/templatetags/searchkit.py,sha256=HpEGTGYi_enDh_bgTgWdVbZftNuZqRt4J9N5A0Nc1AM,581
+build/lib/example/example/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/example/example/admin.py,sha256=KDjYyHPEqNdv7Xe8yx0VuWdx-bDn7qKKHM5ZYhFwdU0,445
+build/lib/example/example/asgi.py,sha256=mqLnzcCH9X-8UhDo5ZhcM8tF3jtALEGSjsBmphbkLcs,391
+build/lib/example/example/models.py,sha256=fB9X782cX01Yg2uIiPCVgrS8C7DkgG9U-9mxGtX3P7Q,1097
+build/lib/example/example/settings.py,sha256=du9bWbAceSvDkYeNYOc_3KxKL1p1se93TdAueT2RQ_E,3256
+build/lib/example/example/urls.py,sha256=D8LxjiTdJSA87AVh3BzpVo5E2aC30hlp20HshPDrfvU,800
+build/lib/example/example/wsgi.py,sha256=OAXHHeNQoj7FBDc5NMET39i_kIGpFrcdNDdY1thrh58,391
+build/lib/example/example/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/example/example/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/example/example/management/commands/createtestdata.py,sha256=IVtyUqak133h9Ua-Ag_GP8mw3dUdiDYAa2tGmLkKluU,2737
+build/lib/example/example/migrations/0001_initial.py,sha256=62tOi17oHGuqqLmSAYWLep6AMkxCJF6Tp13odghS7gI,2014
+build/lib/example/example/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/searchkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/searchkit/__version__.py,sha256=g6zhPyD9UelvcYrhtmQjIk-7_RH9Bu2W8YLlyW3M5OM,661
+build/lib/searchkit/admin.py,sha256=URZgMKnfKlDqOgmQXJHu7mFGrjwkElpunAUbp2_9JcA,1182
+build/lib/searchkit/apps.py,sha256=17m6wPu5N59Dq4MLoWaQd0aNHEzMT4z4emQD632GIMA,150
+build/lib/searchkit/filters.py,sha256=l8756ftyURUpK3KSkl__TDP5KpqaapxjYMaAjh729ps,1098
+build/lib/searchkit/models.py,sha256=0LEe0z3jOTqAGrqNGknDDY1L1anaG3kCcQ_Zm_7dl9I,800
+build/lib/searchkit/tests.py,sha256=qm8rvKC8aDnaspIXwzCsDwMkfXMR4uOHzqDLWhdv2dA,14849
+build/lib/searchkit/urls.py,sha256=Mhrq4CUOhrh28ZhRocSP2AYnfWFW2c_eJyMR81q5fps,162
+build/lib/searchkit/views.py,sha256=ECSwsge2pD0OJLHdHwpOdWS7XiItUX2NFCO8FSjBigE,919
+build/lib/searchkit/forms/__init__.py,sha256=FBggDa1owkYrceIU3cqNhqsMB49RJWZRAkA4OfvUMcM,207
+build/lib/searchkit/forms/fields.py,sha256=TpFZdAyWKaMhOoZFTuy5ODNrW6RLy289Lk1fcMSGJ20,1621
+build/lib/searchkit/forms/search.py,sha256=mca67piLDqKUhXzaKIOztk5Gg8V1XL21n27aIffH88A,2330
+build/lib/searchkit/forms/searchkit.py,sha256=pg3vw6dMdtaHja-g1Yh72XJkLp7I48nXht9zxWbGW9Y,6022
+build/lib/searchkit/forms/utils.py,sha256=m8vwB-3AoYuMx0QxlJTwSWbDHBG8MyCxFmsyK6xyai8,5221
+build/lib/searchkit/migrations/0001_initial.py,sha256=cP886X1UMrDTf-KxfHfuoQ4b1T1lhdNJyVNOGMNyWNw,1093
+build/lib/searchkit/migrations/0002_rename_searchkitsearch_search.py,sha256=RHXShizf689AdPb2Ca-hONWmwZbB2Fs5DQhXlEPE-f0,389
+build/lib/searchkit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/searchkit/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+build/lib/searchkit/templatetags/searchkit.py,sha256=HpEGTGYi_enDh_bgTgWdVbZftNuZqRt4J9N5A0Nc1AM,581
+django_searchkit-1.2.dist-info/licenses/LICENCE,sha256=oqmlRYPA5GHG2T1yp8fPFGQdOO-NnJPdGITeFiJYWLg,1521
+example/example/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+example/example/admin.py,sha256=KDjYyHPEqNdv7Xe8yx0VuWdx-bDn7qKKHM5ZYhFwdU0,445
+example/example/asgi.py,sha256=mqLnzcCH9X-8UhDo5ZhcM8tF3jtALEGSjsBmphbkLcs,391
+example/example/models.py,sha256=fB9X782cX01Yg2uIiPCVgrS8C7DkgG9U-9mxGtX3P7Q,1097
+example/example/settings.py,sha256=du9bWbAceSvDkYeNYOc_3KxKL1p1se93TdAueT2RQ_E,3256
+example/example/urls.py,sha256=D8LxjiTdJSA87AVh3BzpVo5E2aC30hlp20HshPDrfvU,800
+example/example/wsgi.py,sha256=OAXHHeNQoj7FBDc5NMET39i_kIGpFrcdNDdY1thrh58,391
+example/example/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+example/example/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+example/example/management/commands/createtestdata.py,sha256=IVtyUqak133h9Ua-Ag_GP8mw3dUdiDYAa2tGmLkKluU,2737
+example/example/migrations/0001_initial.py,sha256=62tOi17oHGuqqLmSAYWLep6AMkxCJF6Tp13odghS7gI,2014
+example/example/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+searchkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+searchkit/__version__.py,sha256=g6zhPyD9UelvcYrhtmQjIk-7_RH9Bu2W8YLlyW3M5OM,661
+searchkit/admin.py,sha256=URZgMKnfKlDqOgmQXJHu7mFGrjwkElpunAUbp2_9JcA,1182
+searchkit/apps.py,sha256=17m6wPu5N59Dq4MLoWaQd0aNHEzMT4z4emQD632GIMA,150
+searchkit/filters.py,sha256=l8756ftyURUpK3KSkl__TDP5KpqaapxjYMaAjh729ps,1098
+searchkit/models.py,sha256=0LEe0z3jOTqAGrqNGknDDY1L1anaG3kCcQ_Zm_7dl9I,800
+searchkit/tests.py,sha256=qm8rvKC8aDnaspIXwzCsDwMkfXMR4uOHzqDLWhdv2dA,14849
+searchkit/urls.py,sha256=Mhrq4CUOhrh28ZhRocSP2AYnfWFW2c_eJyMR81q5fps,162
+searchkit/views.py,sha256=ECSwsge2pD0OJLHdHwpOdWS7XiItUX2NFCO8FSjBigE,919
+searchkit/forms/__init__.py,sha256=FBggDa1owkYrceIU3cqNhqsMB49RJWZRAkA4OfvUMcM,207
+searchkit/forms/fields.py,sha256=TpFZdAyWKaMhOoZFTuy5ODNrW6RLy289Lk1fcMSGJ20,1621
+searchkit/forms/search.py,sha256=mca67piLDqKUhXzaKIOztk5Gg8V1XL21n27aIffH88A,2330
+searchkit/forms/searchkit.py,sha256=pg3vw6dMdtaHja-g1Yh72XJkLp7I48nXht9zxWbGW9Y,6022
+searchkit/forms/utils.py,sha256=m8vwB-3AoYuMx0QxlJTwSWbDHBG8MyCxFmsyK6xyai8,5221
+searchkit/migrations/0001_initial.py,sha256=cP886X1UMrDTf-KxfHfuoQ4b1T1lhdNJyVNOGMNyWNw,1093
+searchkit/migrations/0002_rename_searchkitsearch_search.py,sha256=RHXShizf689AdPb2Ca-hONWmwZbB2Fs5DQhXlEPE-f0,389
+searchkit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+searchkit/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+searchkit/templatetags/searchkit.py,sha256=HpEGTGYi_enDh_bgTgWdVbZftNuZqRt4J9N5A0Nc1AM,581
+django_searchkit-1.2.dist-info/METADATA,sha256=uKoqf1iEWc63SpPhb3cRFIvfY9_J3ziOoPgazA8Dn_w,3325
+django_searchkit-1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_searchkit-1.2.dist-info/top_level.txt,sha256=-4gF42VIaG-ckn2rb2wFa7LhxIZymHBsYVedNOr_NIY,29
+django_searchkit-1.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+django_searchkit-1.2.dist-info/RECORD,,

example/example/admin.py

@@ -7,7 +7,7 @@ from .models import ModelB
 @admin.register(ModelA)
 class ModelAAdmin(admin.ModelAdmin):
     list_display = [f.name for f in ModelA._meta.fields]
-    list_filter = [SearchkitFilter, 'chars_choices']
+    list_filter = [SearchkitFilter]
 
 
 @admin.register(ModelB)

searchkit/__version__.py

@@ -13,4 +13,4 @@ Version 0.x should be considered a development version with an unstable API,
 and backwards compatibility is not guaranteed for minor versions.
 """
 
-__version__ = "1.0"
+__version__ = "1.2"