From f461751c554245a7bb9a17b4a0196977b864b8b0 Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Thu, 26 Jan 2017 10:51:51 +0200 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=84=D0=B8=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D1=80=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/events/forms.py | 11 ++++++++--- apps/events/views.py | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/events/forms.py b/apps/events/forms.py index 43e47dce..d4e0aad0 100644 --- a/apps/events/forms.py +++ b/apps/events/forms.py @@ -498,9 +498,14 @@ class FilterForm(forms.Form): rating_params = self.make_rating_sqs_params() if rating_params is not None: qs = qs.filter(rating_params) - query = self.cleaned_data.get('query') - if query: - qs = qs.autocomplete(content_auto=query) + + # FIXME: комментируем данный кусок, так как на странице поиска + # фильтры не верно считают. Пока только комментируем для того, + # чтобы убедиться или больше ничего не сломали + # query = self.cleaned_data.get('query') + # if query: + # qs = qs.autocomplete(content_auto=query) + where_query = self.cleaned_data.get('where_query') if where_query: qs = qs.filter(where__contains=where_query) diff --git a/apps/events/views.py b/apps/events/views.py index 56947b3c..92a1ec49 100644 --- a/apps/events/views.py +++ b/apps/events/views.py @@ -27,8 +27,8 @@ class FilterListView_(ContextMixin, FormMixin, ListView): form_class = FilterForm paginate_by = settings.CLIENT_PAGINATION template_name = 'client/events/filter_listview.html' - _ajax_results_template_name = 'events/filter_listview_ajax.html' - _ajax_form_template_name = 'includes/events/filter_form.html' + _ajax_results_template_name = 'client/events/filter_listview_ajax.html' + _ajax_form_template_name = 'client/includes/events/filter_form.html' def get_form_kwargs(self): kwargs = super(FilterListView_, self).get_form_kwargs()