Task #134: reverse relating between articles and topics

diff --git a/app/organization/magazine/migrations/0006_auto_20160825_1543.py b/app/organization/magazine/migrations/0006_auto_20160825_1543.py
new file mode 100644 (file)
index 0000000..49d9c23
--- /dev/null
+++ b/app/organization/magazine/migrations/0006_auto_20160825_1543.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-25 13:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-magazine', '0005_auto_20160825_1308'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='topic',
+            name='articles',
+            field=models.ManyToManyField(blank=True, related_name='topics', to='organization-magazine.Article', verbose_name='articles'),
+        ),
+    ]

diff --git a/app/organization/magazine/migrations/0007_auto_20160825_1614.py b/app/organization/magazine/migrations/0007_auto_20160825_1614.py
new file mode 100644 (file)
index 0000000..7818a0e
--- /dev/null
+++ b/app/organization/magazine/migrations/0007_auto_20160825_1614.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-25 14:14
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-magazine', '0006_auto_20160825_1543'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='topic',
+            name='articles',
+        ),
+        migrations.AddField(
+            model_name='article',
+            name='topics',
+            field=models.ManyToManyField(blank=True, null=True, related_name='articles', to='organization-magazine.Topic', verbose_name='topics'),
+        ),
+    ]

diff --git a/app/organization/magazine/models.py b/app/organization/magazine/models.py
index ceab5e1fede94caf3920ef22e328d837ae02f6a3..559d383b8636146c9837305a74c6d6dddf426ca2 100644 (file)
--- a/app/organization/magazine/models.py
+++ b/app/organization/magazine/models.py
@@ -19,7 +19,7 @@ class Article(BlogPost, SubTitled):
     related_articles = models.ManyToManyField("self",
                                  verbose_name=_("Related articles"), blank=True)
     department = models.ForeignKey(Department, related_name='articles', limit_choices_to=dict(id__in=Department.objects.all()), blank=True, null=True, on_delete=models.SET_NULL)
-    model_name = _('article')
+    topics = models.ManyToManyField("Topic", verbose_name=_('topics'), related_name="articles", blank=True, null=True)
 
     def get_absolute_url(self):
         return reverse("magazine-article-detail", kwargs={"slug": self.slug})
@@ -72,7 +72,7 @@ class Brief(Displayable, RichText): #Orderable
 class Topic(Page, RichText):
     """Topic for magazine menu"""
 
-    articles = models.ManyToManyField(Article, verbose_name=_('articles'), blank=True)
+    #articles = models.ManyToManyField(Article, verbose_name=_('articles'), related_name="topics", blank=True)
 
     class Meta:
         verbose_name = _('topic')