From 11cb733b40aa1ae8ced49c34d3e612a03e690af6 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Thu, 6 Oct 2016 17:51:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BE=D1=88=D0=B5=D0=BB=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=20hvad=20=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=8B=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- emencia/django/newsletter/forms.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/emencia/django/newsletter/forms.py b/emencia/django/newsletter/forms.py index 5e59f5a8..07bfe564 100644 --- a/emencia/django/newsletter/forms.py +++ b/emencia/django/newsletter/forms.py @@ -169,7 +169,13 @@ class MailingSettingsForm(forms.ModelForm): # foreign countries self.initial['co'] = set(self.instance.f_countries.values_list('pk', flat=True)) - self.fields['co'].c_queryset = self.instance.f_countries.distinct() + co_query = Country.objects.language().all().order_by('name') + where = " `{db_table}_translation`.`language_code` = '{lang}' "\ + .format( + db_table=Country._meta.db_table, + lang=get_language()) + co_query = co_query.extra(where=[where]) + self.fields['co'].c_queryset = co_query self.fields['co'].widget.choices = self.fields['co'].choices # russia cities