From: Emilie <zawadzki@ircam.fr>
Date: Sat, 24 Sep 2016 09:46:50 +0000 (+0200)
Subject: Article : deleted related_article, replaced by dynamic content | fix article_card... 
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=65bcce3ce33162ccd0eb77b3f6c9f0ca9b25668a;p=mezzo.git

Article : deleted related_article, replaced by dynamic content | fix article_card in DepartmentPage
---

diff --git a/app/organization/magazine/admin.py b/app/organization/magazine/admin.py
index 1891bc31..462c5b15 100644
--- a/app/organization/magazine/admin.py
+++ b/app/organization/magazine/admin.py
@@ -38,7 +38,7 @@ class ArticleAdminDisplayable(DisplayableAdmin):
 
     fieldsets = deepcopy(ArticleAdmin.fieldsets)
     exclude = ('related_posts',)
-    filter_horizontal = ['categories', 'related_articles', ]
+    filter_horizontal = ['categories',]
     inlines = [ArticleImageInline,
               ArticlePersonAutocompleteInlineAdmin,
               DynamicContentArticleInline]
diff --git a/app/organization/magazine/migrations/0008_remove_article_related_articles.py b/app/organization/magazine/migrations/0008_remove_article_related_articles.py
new file mode 100644
index 00000000..a5e8add2
--- /dev/null
+++ b/app/organization/magazine/migrations/0008_remove_article_related_articles.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-24 09:20
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-magazine', '0007_auto_20160924_1058'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='article',
+            name='related_articles',
+        ),
+    ]
diff --git a/app/organization/magazine/models.py b/app/organization/magazine/models.py
index d9276b26..993748b7 100644
--- a/app/organization/magazine/models.py
+++ b/app/organization/magazine/models.py
@@ -16,7 +16,6 @@ from organization.core.models import *
 
 class Article(BlogPost, SubTitled):
 
-    related_articles = models.ManyToManyField("self", verbose_name=_("Related articles"), blank=True)
     department = models.ForeignKey(Department, verbose_name=_('department'), related_name='articles', limit_choices_to=dict(id__in=Department.objects.all()), blank=True, null=True, on_delete=models.SET_NULL)
     topics = models.ManyToManyField("Topic", verbose_name=_('topics'), related_name="articles", blank=True)
 
diff --git a/app/templates/magazine/brief/inc/brief_card.html b/app/templates/magazine/brief/inc/brief_card.html
index dc07fc38..efe6b363 100644
--- a/app/templates/magazine/brief/inc/brief_card.html
+++ b/app/templates/magazine/brief/inc/brief_card.html
@@ -1,7 +1,7 @@
 {% load i18n mezzanine_tags %}
 
 <div class="brief-box">
-
+    
     <div class="brief-box__head">
         {% trans 'Brief !' %}
     </div>
diff --git a/app/templates/pages/departmentpage.html b/app/templates/pages/departmentpage.html
index 343de4f4..f833a2eb 100644
--- a/app/templates/pages/departmentpage.html
+++ b/app/templates/pages/departmentpage.html
@@ -89,9 +89,7 @@
 {% endblock %}
 
 {% block page_related_content %}
-
-    {% if page.departmentpage.articles_related.all %}
-
+    {% if page.departmentpage.department.articles.all %}
         <div class="white-bg pb2">
             <div class="container">
                 <div class="row tac">
@@ -100,7 +98,7 @@
                     </div>
                 </div>
                 <div class="row tac">
-                    {% for article in page.departmentpage.articles_related.all %}
+                    {% for article in page.departmentpage.department.articles.all %}
                         <div class="col-lg-3 col-md-4 col-sm-4 col-xs-6">
                             {% include 'magazine/article/includes/article_card.html' %}
                         </div>