From 56443837749da987f292a6da8486bd0869b7da26 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Thu, 21 Jul 2016 11:19:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=20-=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D0=B5=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0=20=D1=81=D0=BF?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=B0=20=D1=80=D0=B0=D1=81=D1=81=D1=8B=D0=BB?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=20=D0=B8=D1=82=D0=BE=D0=B3=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- emencia/django/newsletter/forms.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/emencia/django/newsletter/forms.py b/emencia/django/newsletter/forms.py index e54bc326..dcc9baf3 100644 --- a/emencia/django/newsletter/forms.py +++ b/emencia/django/newsletter/forms.py @@ -103,8 +103,6 @@ class ContactSettingsForm(forms.ModelForm): return Theme.objects.none() - - class ContactFilterForm(forms.Form): email = forms.EmailField( label="Email", @@ -132,8 +130,8 @@ class ContactFilterForm(forms.Form): label="Area", choices=[(c.id, c.name) for c in list(set(Area.objects.language()))], required=False ) - mailinglist = forms.ChoiceField( - choices=[("", "---")]+[(ml.id, ml.name) for ml in MailingList.objects.all()], + mailinglist = forms.ModelChoiceField( + queryset=MailingList.objects.all(), label="Список рассылки", required=False ) @@ -147,8 +145,8 @@ class ContactFilterForm(forms.Form): title = u'contact list ' qs = Contact.objects.all().select_related('contactsettings') if self.cleaned_data.get('mailinglist'): - qs = qs.filter(mailinglist_subscriber__id=self.cleaned_data['mailinglist']) - title += u" mailinglist: %s" % MailingList.objects.get(id=self.cleaned_data['mailinglist']).name + qs = qs.filter(mailinglist_subscriber__id=self.cleaned_data['mailinglist'].pk) + title += u" mailinglist: %s" % self.cleaned_data['mailinglist'].name if self.cleaned_data.get('country'): qs = qs.filter(contactsettings__country__id__in=self.cleaned_data['country'])