From 62fa8f709ea471e585cb54d88116aad65f4e87bf Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Fri, 5 Aug 2016 20:55:24 +0300 Subject: [PATCH] =?UTF-8?q?1461:=20=D0=AD=D1=82=D0=B0=D0=BF=20=E2=84=965:?= =?UTF-8?q?=20=D0=A4=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9=20=D1=81=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20GET?= =?UTF-8?q?=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- events/views.py | 7 +++ templates/client/events/filter_listview.html | 8 ++-- .../client/events/filter_listview_ajax.html | 2 +- .../client/includes/events/paginator.html | 45 +++++++++++++++++++ 4 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 templates/client/includes/events/paginator.html diff --git a/events/views.py b/events/views.py index da3573f0..ae8084ff 100644 --- a/events/views.py +++ b/events/views.py @@ -35,6 +35,13 @@ class FilterListView(ContextMixin, FormMixin, ListView): def get(self, request, *args, **kwargs): self.form = self.get_form(self.get_form_class()) self.extra_ctx['form'] = self.form + + # get params for paginator + get = request.GET.copy() + if 'page' in get: + del get[key] + self.extra_ctx['GETparams'] = get.urlencode() + # ajax or get self.template_name = self._template_name_ajax if request.is_ajax() else self._template_name return super(FilterListView, self).get(request, *args, **kwargs) diff --git a/templates/client/events/filter_listview.html b/templates/client/events/filter_listview.html index 13d58ea2..c3282148 100644 --- a/templates/client/events/filter_listview.html +++ b/templates/client/events/filter_listview.html @@ -33,9 +33,7 @@ {% endblock %} {% block paginator %} - - {% with page_obj=page_obj queries=queries %} - {% include 'client/includes/search_paginator.html' %} - {% endwith %} - + {% with page_obj=page_obj queries=queries %} + {% include 'client/includes/events/paginator.html' %} + {% endwith %} {% endblock %} diff --git a/templates/client/events/filter_listview_ajax.html b/templates/client/events/filter_listview_ajax.html index bfee2165..ae9e7a2c 100644 --- a/templates/client/events/filter_listview_ajax.html +++ b/templates/client/events/filter_listview_ajax.html @@ -20,6 +20,6 @@ {% block paginator %} {% with page_obj=page_obj queries=queries %} - {% include 'client/includes/search_paginator.html' %} + {% include 'client/includes/events/paginator.html' %} {% endwith %} {% endblock %} diff --git a/templates/client/includes/events/paginator.html b/templates/client/includes/events/paginator.html new file mode 100644 index 00000000..0c1f6dfa --- /dev/null +++ b/templates/client/includes/events/paginator.html @@ -0,0 +1,45 @@ +{% load i18n %} +{% load template_filters %} + +{% if page_obj.paginator.num_pages > 1 %} + +{% endif %}