From 48bcf280249a3990e1ed42ac4f6ddddddfa65677 Mon Sep 17 00:00:00 2001 From: Ivan Kovalkovskyi Date: Mon, 12 Oct 2015 18:14:58 +0300 Subject: [PATCH] _ --- emencia/django/newsletter/forms.py | 2 +- emencia/django/newsletter/views/admin_views.py | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/emencia/django/newsletter/forms.py b/emencia/django/newsletter/forms.py index f4f75b94..c73f0636 100644 --- a/emencia/django/newsletter/forms.py +++ b/emencia/django/newsletter/forms.py @@ -108,7 +108,7 @@ class ContactFilterForm(forms.Form): title += " countries: %s" % ','.join([obj.url for obj in Country.objects.language().filter(id__in=self.cleaned_data['country'])]) if self.cleaned_data.get('area'): qs = qs.filter(contactsettings__area__id__in=self.cleaned_data['area']) - title += " geo area: %s" % ','.join([obj.url for obj in Area.objects.language('en').filter(id__in=self.cleaned_data['area'])]) + title += " geo area: %s" % ','.join([tr(obj.name) for obj in Area.objects.language('en').filter(id__in=self.cleaned_data['area'])]) if self.cleaned_data.get('active'): title = ' active ' + title qs = qs.filter(activated=True) diff --git a/emencia/django/newsletter/views/admin_views.py b/emencia/django/newsletter/views/admin_views.py index e0210c4e..70eee458 100644 --- a/emencia/django/newsletter/views/admin_views.py +++ b/emencia/django/newsletter/views/admin_views.py @@ -1,16 +1,11 @@ # -*- coding: utf-8 -*- from django.views.generic import TemplateView, CreateView, ListView, UpdateView, DeleteView, FormView from django.conf import settings -from django.http import HttpResponseRedirect from django.forms.formsets import BaseFormSet, formset_factory from django.http import HttpResponseRedirect, HttpResponse -from django.shortcuts import get_object_or_404 -from django.core.urlresolvers import reverse +from django.core.urlresolvers import reverse_lazy from emencia.django.newsletter.models import Contact, ContactSettings, MailingList, Newsletter, Attachment from emencia.django.newsletter.admin_forms import ContactSettingsForm, MailingListForm, NewsletterForm, AttachmentForm -from django.core.urlresolvers import reverse_lazy -from emencia.django.newsletter.models import Contact, ContactSettings, MailingList, Newsletter -from emencia.django.newsletter.admin_forms import ContactSettingsForm, MailingListForm, NewsletterForm from ..forms import ContactFilterForm from functions.admin_views import paginate_results @@ -179,7 +174,8 @@ class NewsletterUpdate(UpdateView): class NewsletterListView(ListView): paginate_by = settings.ADMIN_PAGINATION model = Newsletter - template_name = 'admin/newsletters/newsletter_list.html' success_url = '/admin/newsletters/newsletters/all/' + template_name = 'admin/newsletters/newsletter_list.html' + success_url = '/admin/newsletters/newsletters/all/' from ..utils.excel import ExcelResponse @@ -195,4 +191,4 @@ class ExportContacts(FormView): if qs.count(): columns = ('first_name', 'email') return ExcelResponse(qs, title, columns,'contacts') - return HttpResponseRedirect(self.request.META['HTTP_REFERER']) \ No newline at end of file + return HttpResponseRedirect(self.request.META['HTTP_REFERER'])