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 %} -