From 560e8ae4378919b6d9cf73128daa0f73e4bf582b Mon Sep 17 00:00:00 2001
From: Slava Kyrachevsky <slava.deb@gmail.com>
Date: Tue, 14 Feb 2017 15:17:53 +0200
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=BD=20=D0=B2=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/conference/forms.py                      |  2 +-
 apps/exposition/forms.py                      |  2 +-
 apps/place_exposition/forms.py                |  2 +-
 proj/admin.py                                 |  2 +-
 static/custom_js/main.js                      | 27 ++++++++++---------
 .../place_exposition/place_exposition.html    |  8 +++---
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/apps/conference/forms.py b/apps/conference/forms.py
index e647c33e..8d034de4 100644
--- a/apps/conference/forms.py
+++ b/apps/conference/forms.py
@@ -56,7 +56,7 @@ class ConferenceCreateForm(forms.Form):
     #organiser = forms.MultipleChoiceField(label=u'Организаторы', required=False,
     #                                      choices=[(item.id, item.name) for item in Organiser.objects.language().all()])
     org = forms.CharField(required=False, label=_(u'Организатор'))
-    country = forms.ChoiceField(label=_(u'Страна'), choices=[(c.id, c.name) for c in Country.objects.language().all()])
+    country = forms.ChoiceField(label=_(u'Страна'), choices=list(set([(c.id, c.name) for c in Country.objects.language().all()])))
     theme = forms.MultipleChoiceField(label=_(u'Тематики'),
                                       choices=[(item.id, item.name) for item in Theme.objects.language().all()])
 
diff --git a/apps/exposition/forms.py b/apps/exposition/forms.py
index 05172454..ed495358 100644
--- a/apps/exposition/forms.py
+++ b/apps/exposition/forms.py
@@ -49,7 +49,7 @@ class ExpositionCreateForm(forms.Form):
 
     #company = forms.MultipleChoiceField(label=u'Компании', required=False,
     #                                    choices=[(item.id, item.name) for item in Company.objects.language().all()] )
-    country = forms.ChoiceField(label=_(u'Страна'), choices=[(c.id, c.name) for c in Country.objects.language().all()])
+    country = forms.ChoiceField(label=_(u'Страна'), choices=list(set([(c.id, c.name) for c in Country.objects.language().all()])))
     theme = forms.MultipleChoiceField(
         label=_(u'Тематики'),
         choices=[(item.id, item.name) for item in Theme.objects.language().filter(types=Theme.types.exposition)])
diff --git a/apps/place_exposition/forms.py b/apps/place_exposition/forms.py
index aca9867d..ce0f721a 100644
--- a/apps/place_exposition/forms.py
+++ b/apps/place_exposition/forms.py
@@ -30,7 +30,7 @@ class ExpositionForm(forms.Form):
     type = forms.ChoiceField(required=False, choices=types)
     logo = forms.ImageField(label=_(u'Logo'), required=False, max_length=500)
 
-    country = forms.ChoiceField(label=_(u'Страна'), choices=[(c.id, c.name) for c in Country.objects.language().all()])
+    country = forms.ChoiceField(label=_(u'Страна'), choices=list(set([(c.id, c.name) for c in Country.objects.language().all()])))
     # creates select input with empty choices cause it will be filled with ajax
     city = forms.CharField(label=_(u'Город'), widget=forms.HiddenInput())
 
diff --git a/proj/admin.py b/proj/admin.py
index 2f83ba63..aaf121a5 100644
--- a/proj/admin.py
+++ b/proj/admin.py
@@ -26,7 +26,7 @@ def ajax_city(request):
     returns html <option> tags filled with cities filtered by country value from request
     """
     objects = City.objects.language().filter(country=request.GET['id']).order_by('name')
-    return render_to_response('select.html', {'objects': objects})
+    return render_to_response('c_admin/select.html', {'objects': objects})
 
 
 def ajax_tag(request):
diff --git a/static/custom_js/main.js b/static/custom_js/main.js
index 4dfa6759..e6e6e015 100644
--- a/static/custom_js/main.js
+++ b/static/custom_js/main.js
@@ -224,18 +224,17 @@ $(document).ready(function(){
     $('.off').click(function(){
         var url = $(this).attr('href')
         var $this = $(this)
-        $.get(
-            url, function(data){
-                    if (data == 'off'){
-                        $this.hide();
-                        $this.siblings('.on').show();
-                    }
-                }
-        )
+        $.get(url,function(data){
+            if (data == 'off'){
+                $this.hide();
+                $this.siblings('.on').show();
+            }
+        });
         return false;
     });
+
     //  end on-of events
-    if( $("#id_city" ).length ) {
+    if( $("#id_city").length ) {
         $('#id_city').select2({
             placeholder: "Город",
             width: 'element',
@@ -245,7 +244,7 @@ $(document).ready(function(){
                 dataType: "json",
                 quietMillis: 200,
 
-                data: function(term, page, country){
+                data: function(term, page){
                     var country = $('#id_country').val();
                     return {term: term,
                             page: page,
@@ -253,21 +252,23 @@ $(document).ready(function(){
                 },
 
                 results: function (data) {
+                    console.log('results');
                     if (typeof(data) == 'string'){
                         data = JSON.parse(data);
                     }
+                    console.log(data);
                     var results = [];
                     $.each(data, function(index, item){
                         results.push({
-                          id: item.id,
-                          text: item.label
+                            id: item.id,
+                            text: item.label
                         });
                     });
                     return {results: results};
                 }
             },
             initSelection : function(element, callback) {
-                var id=	$(element).val();
+                var id = $(element).val();
                 var text = $(element).attr('data-init-text');
                 callback({id: id, text:text});
             }
diff --git a/templates/c_admin/place_exposition/place_exposition.html b/templates/c_admin/place_exposition/place_exposition.html
index 59fd8060..6dfd6c08 100644
--- a/templates/c_admin/place_exposition/place_exposition.html
+++ b/templates/c_admin/place_exposition/place_exposition.html
@@ -16,13 +16,13 @@
     <script src="{% static 'ckeditor/ckeditor/ckeditor.js' %}"></script>
     {# google map не забыть скачать скрипты на локал #}
     <link href='https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/redmond/jquery-ui.css' rel="stylesheet"/>
-    <script src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js'></script>
+{#    <script src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js'></script>#}
     <script src='https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js'></script>
     <script src='https://maps.google.com/maps/api/js?sensor=false'></script>
     {# selects #}
-    <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
-    <script src="{% static 'js/select/select2.js' %}"></script>
-    <script src="{% static 'custom_js/formset_add.js' %}"></script>
+{#    <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>#}
+{#    <script src="{% static 'js/select/select2.js' %}"></script>#}
+{#    <script src="{% static 'custom_js/formset_add.js' %}"></script>#}
     {# ajax #}
 
 <!--      <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>-->