Many to many playground

joplin/base/migrations/0082_servicepage_related_topics.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.4 on 2019-08-21 22:36
+
+from django.db import migrations
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0081_auto_20190807_1916'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='servicepage',
+            name='related_topics',
+            field=modelcluster.fields.ParentalManyToManyField(blank=True, to='base.TopicPage'),
+        ),
+    ]

joplin/base/migrations/0083_topicpage_related_pages.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.4 on 2019-08-21 22:47
+
+from django.db import migrations
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0082_servicepage_related_topics'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='topicpage',
+            name='related_pages',
+            field=modelcluster.fields.ParentalManyToManyField(blank=True, to='base.ServicePage'),
+        ),
+    ]

joplin/base/models/service_page.py

@@ -1,7 +1,8 @@
 from django.db import models
+from django import forms
 
 from modelcluster.models import ClusterableModel
-from modelcluster.fields import ParentalKey
+from modelcluster.fields import ParentalKey, ParentalManyToManyField
 
 from wagtail.core.fields import RichTextField, StreamField
 from wagtail.core.blocks import ListBlock, RichTextBlock, StructBlock, TextBlock
@@ -17,8 +18,10 @@
 from .constants import WYSIWYG_GENERAL, SHORT_DESCRIPTION_LENGTH
 WYSIWYG_SERVICE_STEP = ['ul', 'ol', 'link', 'code', 'rich-text-button-link']
 
+
 class ServicePage(JanisBasePage):
     janis_url_page_type = "services"
+    related_topics = ParentalManyToManyField('base.TopicPage', blank=True)
 
     steps = StreamField(
         [
@@ -28,7 +31,8 @@ class ServicePage(JanisBasePage):
             )),
             ('step_with_options_accordian', StructBlock(
                 [
-                    ('options_description', TextBlock('Describe the set of options')),
+                    ('options_description', TextBlock(
+                        'Describe the set of options')),
                     ('options', ListBlock(
                         StructBlock([
                             ('option_name', TextBlock(
@@ -84,30 +88,34 @@ class ServicePage(JanisBasePage):
         InlinePanel('topics', label='Topics'),
         InlinePanel('related_departments', label='Related Departments'),
         MultiFieldPanel(
-        [
-            HelpPanel(steps.help_text, classname="coa-helpPanel"),
-            StreamFieldPanel('steps')
-        ],
-        heading=steps.verbose_name,
-        classname='coa-multiField-nopadding'
+            [
+                HelpPanel(steps.help_text, classname="coa-helpPanel"),
+                StreamFieldPanel('steps')
+            ],
+            heading=steps.verbose_name,
+            classname='coa-multiField-nopadding'
         ),
         StreamFieldPanel('dynamic_content'),
         MultiFieldPanel(
-        [
-            HelpPanel(additional_content.help_text, classname="coa-helpPanel"),
-            FieldPanel('additional_content')
-        ],
-        heading=additional_content.verbose_name,
-        classname='coa-multiField-nopadding'
-        )
-        ,
+            [
+                HelpPanel(additional_content.help_text,
+                          classname="coa-helpPanel"),
+                FieldPanel('additional_content')
+            ],
+            heading=additional_content.verbose_name,
+            classname='coa-multiField-nopadding'
+        ),
         InlinePanel('contacts', label='Contacts'),
+        FieldPanel('related_topics', widget=forms.CheckboxSelectMultiple)
     ]
 
+
 class ServicePageTopic(ClusterableModel):
     page = ParentalKey(ServicePage, related_name='topics')
-    topic = models.ForeignKey('base.TopicPage',  verbose_name='Select a Topic', related_name='+', on_delete=models.CASCADE)
-    toplink = models.BooleanField(default=False, verbose_name='Make this service a top link for this topic')
+    topic = models.ForeignKey(
+        'base.TopicPage',  verbose_name='Select a Topic', related_name='+', on_delete=models.CASCADE)
+    toplink = models.BooleanField(
+        default=False, verbose_name='Make this service a top link for this topic')
 
     panels = [
         MultiFieldPanel(
@@ -121,9 +129,11 @@ class ServicePageTopic(ClusterableModel):
     def __str__(self):
         return self.topic.title
 
+
 class ServicePageContact(ClusterableModel):
     page = ParentalKey(ServicePage, related_name='contacts')
-    contact = models.ForeignKey(Contact, related_name='+', on_delete=models.CASCADE)
+    contact = models.ForeignKey(
+        Contact, related_name='+', on_delete=models.CASCADE)
 
     panels = [
         SnippetChooserPanel('contact'),
@@ -132,8 +142,10 @@ class ServicePageContact(ClusterableModel):
     def __str__(self):
         return self.contact.name
 
+
 class ServicePageRelatedDepartments(ClusterableModel):
-    page = ParentalKey(ServicePage, related_name='related_departments', default=None)
+    page = ParentalKey(
+        ServicePage, related_name='related_departments', default=None)
     related_department = models.ForeignKey(
         "base.departmentPage",
         on_delete=models.PROTECT,
@@ -142,4 +154,4 @@ class ServicePageRelatedDepartments(ClusterableModel):
     panels = [
         # Use a SnippetChooserPanel because blog.BlogAuthor is registered as a snippet
         PageChooserPanel("related_department"),
-    ]
+    ]

joplin/base/models/topic_page.py

@@ -1,7 +1,8 @@
 from django.db import models
+from django import forms
 
 from modelcluster.models import ClusterableModel
-from modelcluster.fields import ParentalKey
+from modelcluster.fields import ParentalKey, ParentalManyToManyField
 
 from wagtail.core.fields import StreamField
 from wagtail.core.blocks import CharBlock, StructBlock, URLBlock
@@ -13,12 +14,15 @@
 from .janis_page import JanisBasePage
 from .translated_image import TranslatedImage
 
+
 class TopicPage(JanisBasePage):
     janis_url_page_type = "topic"
 
     description = models.TextField(blank=True)
+    related_pages = ParentalManyToManyField('base.ServicePage', blank=True)
 
-    image = models.ForeignKey(TranslatedImage, null=True, blank=True, on_delete=models.SET_NULL, related_name='+')
+    image = models.ForeignKey(TranslatedImage, null=True,
+                              blank=True, on_delete=models.SET_NULL, related_name='+')
 
     external_services = StreamField(
         [
@@ -53,16 +57,20 @@ class TopicPage(JanisBasePage):
         FieldPanel('description'),
         ImageChooserPanel('image'),
         StreamFieldPanel('external_services'),
-        InlinePanel('topiccollections', label='Topic Collections this page belongs to'),
+        InlinePanel('topiccollections',
+                    label='Topic Collections this page belongs to'),
+        FieldPanel('related_pages', widget=forms.CheckboxSelectMultiple)
     ]
 
+
 class TopicPageTopicCollection(ClusterableModel):
     page = ParentalKey(TopicPage, related_name='topiccollections')
-    topiccollection = models.ForeignKey('base.TopicCollectionPage',  verbose_name='Select a Topic Collection', related_name='+', on_delete=models.CASCADE)
+    topiccollection = models.ForeignKey(
+        'base.TopicCollectionPage',  verbose_name='Select a Topic Collection', related_name='+', on_delete=models.CASCADE)
 
     panels = [
         PageChooserPanel('topiccollection'),
     ]
 
     def __str__(self):
-        return self.topiccollection.text
+        return self.topiccollection.text