From 22aa699d348be08e3238821b48f3b819b9a5440c Mon Sep 17 00:00:00 2001 From: Ivan Kovalkovskyi Date: Fri, 9 Oct 2015 16:58:30 +0300 Subject: [PATCH] bugs --- emencia/django/newsletter/views/admin_views.py | 5 +++-- templates/admin/newsletters/contact_list.html | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/emencia/django/newsletter/views/admin_views.py b/emencia/django/newsletter/views/admin_views.py index a6466436..8af40dfe 100644 --- a/emencia/django/newsletter/views/admin_views.py +++ b/emencia/django/newsletter/views/admin_views.py @@ -102,6 +102,7 @@ class ExportContacts(FormView): form = self.form_class(request.GET) if form.is_valid(): qs = form.filter() - columns = ('first_name', 'email') - return ExcelResponse(qs, 'contact_import', columns,'contacts') + if qs.count(): + columns = ('first_name', 'email') + return ExcelResponse(qs, 'contact_import', columns,'contacts') return HttpResponseRedirect(self.request.META['HTTP_REFERER']) diff --git a/templates/admin/newsletters/contact_list.html b/templates/admin/newsletters/contact_list.html index f645fdcf..003dd7c9 100644 --- a/templates/admin/newsletters/contact_list.html +++ b/templates/admin/newsletters/contact_list.html @@ -133,7 +133,8 @@ $('legend').on('click', function () { $('.toggled').collapse('toggle'); }); - $('#export').on('click', function(){ + $('#export').on('click', function(event){ + event.preventDefault(); window.location = "{% url 'export_contacts' %}" + get_param; }) })