автокомплит городов в админке

README.md

@@ -70,6 +70,8 @@ cd /opt/solr-4.10.4
 bin/solr start -p 8983
 ```
 
+Если возникает ошибка Solr: [Reason: Error 404 Not Found] - http://stackoverflow.com/a/30633740
+
 #
 ```sh
 python manage.py migrate expobanner 0001 --fake

city/admin.py

@@ -99,8 +99,8 @@ def city_change(request, url):
 
     return render_to_response('city_add.html', args)
 
+
 def search_city(request):
-    # country = request.GET.get('country')
     term = request.GET.get('term')
     # if not term:
     #     qs = City.objects.language().filter(country=country)[:200]

city/search_indexes.py

@@ -29,7 +29,6 @@ class CityIndex(indexes.SearchIndex, indexes.Indexable, ExpoSearchMixin):
         return City
 
     def index_queryset(self, using=None):
-
         return self.get_model().used.all()
 
     def get_updated_field(self):

static/custom_js/main.js

@@ -238,22 +238,25 @@ $(document).ready(function(){
     //  end on-of events
     if( $("#id_city" ).length ) {
         $('#id_city').select2({
-        placeholder: "Город",
+            placeholder: "Город",
-        width: 'element',
+            width: 'element',
-        ajax: {
+            ajax: {
 
                 url: "/admin/city/search/",
                 dataType: "json",
                 quietMillis: 200,
 
                 data: function(term, page, country){
-                    var country = $('#id_country').val()
+                    var country = $('#id_country').val();
                     return {term: term,
                             page: page,
                             country: country};
                 },
 
                 results: function (data) {
+                    if (typeof(data) == 'string'){
+                        data = JSON.parse(data);
+                    }
                     var results = [];
                     $.each(data, function(index, item){
                         results.push({
@@ -268,7 +271,6 @@ $(document).ready(function(){
                 var id=	$(element).val();
                 var text = $(element).attr('data-init-text');
                 callback({id: id, text:text});
-
             }
 
         });

templates/client/includes/header.html

@@ -89,7 +89,7 @@
 
                                 <div class="clb-settings">
 {#                                    <a class="cl-btn icon-gear" href="/profile/settings/">{% trans 'настройки' %}</a>#}
-                                    <a class="" href="/profile/settings/"><i class="fa fa-cog"></i></a>
+                                    <a href="/profile/settings/"><i class="fa fa-cog"></i></a>
                                     {% if user.is_superuser %}
                                         <a href="/admin/"><i class="fa fa-lock"></i></a>
                                     {% endif %}
@@ -105,8 +105,8 @@
                                 <div class="clb-docs">
 {#									<a class="cl-btn icon-cal" href="{% url 'account_calendar' %}">{% trans 'календарь' %}</a>#}
 {#									<a class="cl-btn icon-doc" href="/profile/feed/">{% trans 'документы' %}</a>#}
-                                    <a class="" href="{% url 'account_calendar' %}"><i class="fa fa-calendar"></i></a>
+                                    <a href="{% url 'account_calendar' %}"><i class="fa fa-calendar"></i></a>
-									<a class="" href="/profile/feed/"><i class="fa fa-file-text-o"></i></a>
+									<a href="/profile/feed/"><i class="fa fa-file-text-o"></i></a>
 								</div>
 
                                 <div class="clb-profile">