django-searchkit 1.1__tar.gz → 1.2__tar.gz

{django_searchkit-1.1/django_searchkit.egg-info → django_searchkit-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-searchkit
-Version: 1.1
+Version: 1.2
 Summary: Finally a real searchkit for django!
 Home-page: https://github.com/thomst/django-searchkit
 Author: Thomas Leichtfuß

{django_searchkit-1.1 → django_searchkit-1.2/django_searchkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-searchkit
-Version: 1.1
+Version: 1.2
 Summary: Finally a real searchkit for django!
 Home-page: https://github.com/thomst/django-searchkit
 Author: Thomas Leichtfuß

{django_searchkit-1.1 → django_searchkit-1.2}/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.1"
+__version__ = "1.2"

{django_searchkit-1.1 → django_searchkit-1.2}/searchkit/filters.py

@@ -14,14 +14,15 @@ class SearchkitFilter(SimpleListFilter):
         self.searchkit_model = ContentType.objects.get_for_model(model)
         super().__init__(request, params, model, model_admin)
 
+    def has_output(self):
+        return True
+
     def lookups(self, request, model_admin):
-        # Fetch the last three objects from SearchkitSearch and return them as
-        # choices.
-        searches = Search.objects.filter(contenttype=self.searchkit_model).order_by('-created_date')[:3]
+        searches = Search.objects.filter(contenttype=self.searchkit_model).order_by('-created_date')
         return [(str(obj.id), obj.name) for obj in searches]
 
     def queryset(self, request, queryset):
         # Filter the queryset based on the selected SearchkitSearch object
         if self.value():
             search = Search.objects.get(id=int(self.value()))
-            return search.as_queryset()
+            return queryset.filter(**search.as_lookups())

{django_searchkit-1.1 → django_searchkit-1.2}/searchkit/models.py

@@ -19,9 +19,3 @@ class Search(models.Model):
         for data in self.data:
             lookups[f'{data["field"]}__{data["operator"]}'] = data['value']
         return lookups
-
-    def as_queryset(self):
-        """
-        Returns a filtered queryset for the model.
-        """
-        return self.contenttype.model_class().objects.filter(**self.as_lookups())

{django_searchkit-1.1 → django_searchkit-1.2}/searchkit/tests.py

@@ -263,8 +263,6 @@ class SearchkitSearchFormTestCase(TestCase):
         self.assertEqual(len(filter_rules), len(INITIAL_DATA))
         for data in INITIAL_DATA:
             self.assertIn(f"{data['field']}__{data['operator']}", filter_rules)
-        queryset = form.instance.as_queryset()
-        self.assertTrue(queryset.model == ModelA)
 
 
 class SearchkitModelFormTestCase(TestCase):

{django_searchkit-1.1 → django_searchkit-1.2}/searchkit/views.py

@@ -14,9 +14,9 @@ class SearchkitAjaxView(View):
     Reload the formset via ajax.
     """
     def get(self, request, **kwargs):
-        contenttype_form = SearchkitModelForm(data=self.request.GET)
-        if contenttype_form.is_valid():
-            model = contenttype_form.cleaned_data['searchkit_model'].model_class()
+        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: