django-searchkit 0.1__py3-none-any.whl → 1.1__py3-none-any.whl

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())
+        contenttype_form = SearchkitModelForm(data=self.request.GET)
+        if contenttype_form.is_valid():
+            model = contenttype_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-0.1.dist-info/RECORD

@@ -1,36 +0,0 @@
-django_searchkit-0.1.dist-info/licenses/LICENCE,sha256=oqmlRYPA5GHG2T1yp8fPFGQdOO-NnJPdGITeFiJYWLg,1521
-example/example/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-example/example/admin.py,sha256=eTZ5mCA1ToGouqYgIf-6xDl2nvYAz7T9lU1Bnu_gP9c,462
-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=UrnVsWmQRmq1HwADBGwjljHcaaKf8RXFuEzjigqiQxk,661
-searchkit/admin.py,sha256=75E1jff9LDmzRWNAJ-mpW4yChKtuE1L1WFXeCmCiibI,1218
-searchkit/apps.py,sha256=17m6wPu5N59Dq4MLoWaQd0aNHEzMT4z4emQD632GIMA,150
-searchkit/filters.py,sha256=TSsK8K0Oj7-gTfHLq7zLacZyXeGIM5MtLAHNMbjxYIo,1343
-searchkit/models.py,sha256=pRCWOnwbxroUzyS8SFBSLyAUn0I7udiXP1wIxGB307A,894
-searchkit/tests.py,sha256=IEF8i3hW17PZivk4pK9MNM7gn81C-mTfkwaNLl8HDB0,6484
-searchkit/urls.py,sha256=bqF5UAcUFPfBCCi1CljHSLbjEqHqzj-ripmJ6VbtC7s,289
-searchkit/views.py,sha256=EAA2yyRMsD8wva2F5lKo-X9-mxvFHOqn7bGazS-XNFk,1051
-searchkit/forms/__init__.py,sha256=lhHtkL2orjV7kN2GPx_IlpbME4_i_guigSpHMLemul8,79
-searchkit/forms/fields.py,sha256=TpFZdAyWKaMhOoZFTuy5ODNrW6RLy289Lk1fcMSGJ20,1621
-searchkit/forms/search.py,sha256=b8XzTWFWh1f3kjnEBp7h17xWpl2kHDFYYANSZPBceI4,1400
-searchkit/forms/searchkit.py,sha256=7y-m0jOd69Zni-97x-NMD81wg8WwkTBUNsm13bWiulk,7256
-searchkit/forms/utils.py,sha256=QtCsCveq20eaHc-nWP36-ICPq_CgItr5ckNp2DQ6LAc,4381
-searchkit/migrations/0001_initial.py,sha256=cP886X1UMrDTf-KxfHfuoQ4b1T1lhdNJyVNOGMNyWNw,1093
-searchkit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-searchkit/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-searchkit/templatetags/searchkit.py,sha256=QA-hqxsHJ7vRoRLqFmGeRqRErkywv1pmepVFKqZuKcg,1238
-django_searchkit-0.1.dist-info/METADATA,sha256=hbfgBWIjY4sp2kKMwT2WxdIjSrYH6cOt54eYxDD3gfc,2689
-django_searchkit-0.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-django_searchkit-0.1.dist-info/top_level.txt,sha256=u_pfgvHiVe7yUSQ6f3ESnHMO5MCliX7lQFaUT9idnpk,23
-django_searchkit-0.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-django_searchkit-0.1.dist-info/RECORD,,