1581: решил проблему дублирования географических зон - теперь для любого языка

9 years ago · e5601c5344
parent 29fef677bc
commit e5601c5344
1 changed files with 5 additions and 1 deletions
--- a/emencia/django/newsletter/forms.py
+++ b/emencia/django/newsletter/forms.py
@ -160,7 +160,11 @@ class MailingSettingsForm(forms.ModelForm):
            # area
            self.initial['area'] = set(self.instance.f_countries.values_list('area_id', flat=True))
            area_q = Area.objects.language().all().order_by('name')
-            area_q = area_q.extra(where=[" `{db_table}_translation`.`language_code` = 'ru' ".format(db_table=Area._meta.db_table)])
+            where = " `{db_table}_translation`.`language_code` = '{lang}' "\
+                .format(
+                    db_table=Area._meta.db_table,
+                    lang=get_language())
+            area_q = area_q.extra(where=[where])
            self.fields['area'].queryset = area_q

            # foreign countries