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

emencia/django/newsletter/forms.py

@@ -11,6 +11,7 @@ from django.forms.models import ModelChoiceIterator
 from django.http import Http404
 from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import get_language
 from django.utils.encoding import smart_text, force_text
 
 from haystack.query import SearchQuerySet
@@ -158,6 +159,9 @@ class MailingSettingsForm(forms.ModelForm):
         if self.instance and self.instance.pk:
             # 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)])
+            self.fields['area'].queryset = area_q
 
             # foreign countries
             self.fields['f_countries'].c_queryset = self.instance.f_countries.distinct()

templates/client/popups/mailing_settings_countries.html

@@ -14,10 +14,10 @@
                 <div class="scroll-content">
                     <div class="places-list">
                         <ul class="modal_checkboxes">
-                            {% for value, text in search_form.area.field.choices %}
+                            {% for value, text in form.area.field.choices %}
                                 <li class="level1 level">
                                     <label>
-                                        <input type="checkbox" name="area"  id="id_{{ prefix }}{{ value }}" class="csb-menu-input"  value="{{ value }}" {% for option in search_form.area.value %}{% if option == value|slugify %}checked="checked"{% endif %}{% endfor %}/>
+                                        <input type="checkbox" name="area"  id="id_{{ prefix }}{{ value }}" class="csb-menu-input"  value="{{ value }}">
                                         <span class="custom_checkbox"></span>
                                         <span class="label hidden">{{ text }}</span>
                                     </label>