From 757f786777235b3d9582ffdf21100922cb21f372 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Mon, 8 Aug 2016 12:57:04 +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=D0=BF=D0=BE?= =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D0=BB=20=D0=B3=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5?= =?UTF-8?q?=D0=BA=D1=81=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B0=D1=8F?= =?UTF-8?q?=D0=BA=D1=81=D0=B0=20=D0=B2=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82?= =?UTF-8?q?=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- events/views.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/events/views.py b/events/views.py index 6da56b07..5a0eac3c 100644 --- a/events/views.py +++ b/events/views.py @@ -2,6 +2,7 @@ from django.views.generic.edit import FormMixin from django.conf import settings from django.template.loader import render_to_string +from django.template import RequestContext from haystack.query import SearchQuerySet @@ -19,7 +20,7 @@ class FilterListView(ContextMixin, FormMixin, ListView): initial_ctx = {'filtering': True} form_class = FilterForm paginate_by = settings.CLIENT_PAGINATION - _template_name = 'events/filter_listview.html' + template_name = 'events/filter_listview.html' _ajax_results_template_name = 'events/filter_listview_ajax.html' _ajax_form_template_name = 'includes/events/filter_form.html' @@ -37,22 +38,17 @@ class FilterListView(ContextMixin, FormMixin, ListView): # import pdb; pdb.set_trace() return qs - def handle_ajax(request, *args, **kwargs): - self.template_name = - handle_ajax - def get(self, request, *args, **kwargs): self.form = self.get_form(self.get_form_class()) self.extra_ctx['form'] = self.form - self.template_name = self._template_name # ajax if request.is_ajax(): - self.template_name = self._ajax_results_template_name + ctx = RequestContext(request, self.get_context_data(object_list=self.get_queryset())) data = { 'success': True, - 'results': super(FilterListView, self).get(request, *args, **kwargs), - 'form': render_to_string(self._ajax_form_template_name, {'form': self.form}), + 'results': render_to_string(self._ajax_results_template_name, ctx), + 'form': render_to_string(self._ajax_form_template_name, ctx), } return JsonResponse(data) # usual get @@ -68,6 +64,6 @@ class FilterListView(ContextMixin, FormMixin, ListView): get = self.request.GET.copy() if 'page' in get: del get['page'] - self.context['GETparams'] = get.urlencode() + context['GETparams'] = get.urlencode() return context