From 83c2870319b3bce8f181072af95cecf951c2777d Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Wed, 10 Aug 2016 09:36:09 +0300 Subject: [PATCH] =?UTF-8?q?1461,=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80?= =?UTF-8?q?=D1=8B=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BE=D1=82?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BB=D0=B8=D0=BD?= =?UTF-8?q?=D0=BA=20=D0=B4=D0=BB=D1=8F=20=D0=B0=D1=8F=D0=BA=D1=81=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B0,=20=D0=B2=D0=BE=D0=B7=D0=B2=D1=80?= =?UTF-8?q?=D0=B0=D1=89=D0=B0=D0=B5=D1=82=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82?= =?UTF-8?q?=D1=8B=20(=D0=B1=D0=B5=D0=B7=20=D0=BF=D0=B5=D1=80=D0=B5=D1=81?= =?UTF-8?q?=D1=87=D0=B5=D1=82=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- events/urls.py | 1 + events/views.py | 9 +++++++-- .../client/includes/events/paginator.html | 19 +++++++++++-------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/events/urls.py b/events/urls.py index fd323d55..81c9dcc5 100644 --- a/events/urls.py +++ b/events/urls.py @@ -6,4 +6,5 @@ from .views import FilterListView urlpatterns = patterns('', url(r'^$', FilterListView.as_view(), name='main'), + url(r'^results/$', FilterListView.as_view(), name='results'), ) diff --git a/events/views.py b/events/views.py index 5a0eac3c..7643224b 100644 --- a/events/views.py +++ b/events/views.py @@ -34,7 +34,8 @@ class FilterListView(ContextMixin, FormMixin, ListView): qs = self.form.filter() else: qs = self.form.default_filter() - self.form.recalculate_choices() + if kwargs.get('noform', True): + self.form.recalculate_choices() # import pdb; pdb.set_trace() return qs @@ -48,8 +49,12 @@ class FilterListView(ContextMixin, FormMixin, ListView): data = { 'success': True, 'results': render_to_string(self._ajax_results_template_name, ctx), - 'form': render_to_string(self._ajax_form_template_name, ctx), } + if kwargs.get('noform', True): + data.update({ + 'form': render_to_string(self._ajax_form_template_name, ctx), + }) + return JsonResponse(data) # usual get return super(FilterListView, self).get(request, *args, **kwargs) diff --git a/templates/client/includes/events/paginator.html b/templates/client/includes/events/paginator.html index 0c1f6dfa..f47e0179 100644 --- a/templates/client/includes/events/paginator.html +++ b/templates/client/includes/events/paginator.html @@ -2,44 +2,47 @@ {% load template_filters %} {% if page_obj.paginator.num_pages > 1 %} -