1454: Этап №5: Админка баги - Новости к Конференциям

article/admin_urls.py

@@ -6,11 +6,18 @@ urlpatterns = patterns('article.admin',
     url(r'^blog/all/$', BlogList.as_view()),
     url(r'^news/all/$', NewsList.as_view()),
 
-    url(r'^delete/(?P<slug>.*)/$', ArticleDeleteView.as_view()),
 
+    # create
     url(r'^blog/$', BlogView.as_view()),
     url(r'^news/$', NewsView.as_view()),
 
+    # edit
     url(r'^blog/(?P<slug>.*)/$', BlogView.as_view()),
     url(r'^news/(?P<slug>.*)/$', NewsView.as_view()),
+
+    # delete
+    url(r'^article/(?P<slug>.*)/delete/$', ArticleDeleteView.as_view()),
+
+    # copy
+    #!FIXME whether it is necessary?
 )

conference/admin.py

@@ -322,7 +322,12 @@ def search_conf(request):
         qs = SearchQuerySet().models(Conference).order_by('text')[:30]
     else:
         qs = SearchQuerySet().models(Conference).autocomplete(content_auto=term).order_by('text')[:30]
-    result = [{'id': item.pk, 'label': get_by_lang(item, 'name', lang)} for item in qs]
+
+    result = []
+    for item in qs:
+        label = get_by_lang(item, 'name', lang)
+        if label:
+            result.append({'id': item.pk, 'label': label})
 
     return HttpResponse(json.dumps(result), content_type='application/json')
 

exposition/admin.py

@@ -366,7 +366,11 @@ def search_expo(request):
         qs = SearchQuerySet().models(Exposition).order_by('text')[:30]
     else:
         qs = SearchQuerySet().models(Exposition).autocomplete(content_auto=term).order_by('text')[:30]
-    result = [{'id': item.pk, 'label': get_by_lang(item, 'name', lang)} for item in qs]
+    result = []
+    for item in qs:
+        label = get_by_lang(item, 'name', lang)
+        if label:
+            result.append({'id': item.pk, 'label': label})
 
     return HttpResponse(json.dumps(result), content_type='application/json')
 

fabfile.py

@@ -128,9 +128,6 @@ def t1451():
     with cd(REMOTE_HOME_DIR):
         run('python manage.py migrate expobanner')
 
-        rc('banner_log_update_old')
-        rc('banner_log_update')
-
 register_command('banner_log_update_old')
 register_command('banner_log_update')
 

templates/admin/article/article_admin_list.html

@@ -43,7 +43,7 @@
               </td>
 
               <td>
-                  <a class="btn-small btn-danger delete" href="/admin/article/delete/{{ item.slug }}/">
+                  <a class="btn-small btn-danger delete" href="/admin/article/article/{{ item.slug }}/delete/">
                   {% trans "Удалить" %}
                   </a>
               </td>

templates/admin/article/blog_form.html

@@ -182,8 +182,9 @@
 <script>
 $(document).ready(function(){
     $('#id_exposition').select2({
-        placeholder: "Выставки",
+        placeholder: "Выставка",
-        multiple: true,
+        multiple: false,
+        width: 'element',
         ajax: {
 
             url: "/admin/exposition/search/",
@@ -213,7 +214,42 @@ $(document).ready(function(){
             callback({id: id, text:text});
 
         }
-        });
+    });
+
+    $('#id_conference').select2({
+        placeholder: "Конференция",
+        multiple: false,
+        width: 'element',
+        ajax: {
+
+            url: "/admin/conference/search/",
+            width: '550px',
+            dataType: "json",
+            quietMillis: 200,
+
+            data: function(term, page, theme){
+                return {term: term,
+                        page: page};
+            },
+
+            results: function (data) {
+                var results = [];
+                $.each(data, function(index, item){
+                    results.push({
+                      id: item.id,
+                      text: item.label
+                    });
+                });
+                return {results: results};
+            }
+        },
+        initSelection : function(element, callback) {
+            var id= $(element).val();
+            var text = $(element).attr('data-init-text');
+            callback({id: id, text:text});
+
+        }
+    });
 
 });
 </script>