Merge branch 'develop' into feat/user-progress

Author: ehmadzubair

.gitignore

@@ -114,4 +114,5 @@ GitHub.sublime-settings
 # Data dir for postgres with docker-compose
 legacy-initdb.d/
 
-!iogt/templates/wagtailmedia/media/
+!iogt/templates/wagtailmedia/media/
+.vscode/

home/management/commands/create_initial_data.py

@@ -21,6 +21,7 @@ def clear(self):
         models.BannerIndexPage.objects.all().delete()
         models.Article.objects.all().delete()
         models.Section.objects.all().delete()
+        models.SectionIndexPage.objects.all().delete()
         Image.objects.all().delete()
 
     def create_image(self):
@@ -48,7 +49,10 @@ def create(self, owner, home):
             show_in_menus=True,
             color='1CABE2'
         )
-        home.add_child(instance=youth)
+        section_index_page = models.SectionIndexPage(title='Sections')
+        
+        home.add_child(instance=section_index_page)
+        section_index_page.add_child(instance=youth)
         youth.add_child(instance=internet_safety)
         internet_safety.add_child(instance=article)
 
@@ -64,6 +68,18 @@ def create(self, owner, home):
 
         models.HomePageBanner.objects.create(source=home, banner_page=banner_page)
 
+        footer_index_page = models.FooterIndexPage(title='Footers')
+        home.add_child(instance=footer_index_page)
+
+        footer = models.FooterPage(
+            title='Footer1?',
+            body=[('paragraph',
+                   RichText('Footer1 paragraph1'))],
+            owner=owner,
+            first_published_at=datetime.now(timezone.utc)
+        )
+        footer_index_page.add_child(instance=footer)
+
     def handle(self, *args, **options):
         self.clear()
         self.stdout.write('Existing site structure cleared')

home/migrations/0019_sectionindexpage.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.1.12 on 2021-06-28 08:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtailcore', '0059_apply_collection_ordering'),
+        ('home', '0018_cachesettings'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SectionIndexPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+    ]

home/migrations/0020_auto_20210628_1105.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.1.12 on 2021-06-28 11:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0019_sectionindexpage'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='article',
+            name='tags',
+        ),
+        migrations.RemoveField(
+            model_name='section',
+            name='tags',
+        ),
+        migrations.DeleteModel(
+            name='TaggedItem',
+        ),
+    ]

home/migrations/0021_auto_20210628_1107.py

@@ -0,0 +1,49 @@
+# Generated by Django 3.1.12 on 2021-06-28 11:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+import modelcluster.contrib.taggit
+import modelcluster.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taggit', '0003_taggeditem_add_unique_index'),
+        ('home', '0020_auto_20210628_1105'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SectionTaggedItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content_object', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='tagged_items', to='home.section')),
+                ('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='home_sectiontaggeditem_items', to='taggit.tag')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='ArticleTaggedItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content_object', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='tagged_items', to='home.article')),
+                ('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='home_articletaggeditem_items', to='taggit.tag')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='article',
+            name='tags',
+            field=modelcluster.contrib.taggit.ClusterTaggableManager(blank=True, help_text='A comma-separated list of tags.', through='home.ArticleTaggedItem', to='taggit.Tag', verbose_name='Tags'),
+        ),
+        migrations.AddField(
+            model_name='section',
+            name='tags',
+            field=modelcluster.contrib.taggit.ClusterTaggableManager(blank=True, help_text='A comma-separated list of tags.', through='home.SectionTaggedItem', to='taggit.Tag', verbose_name='Tags'),
+        ),
+    ]

home/models.py

@@ -73,9 +73,19 @@ class HomePageBanner(Orderable):
     ]
 
 
-class TaggedItem(TaggedItemBase):
-    """The through model between Page (Article/Section) and Tag"""
-    content_object = ParentalKey(Page, related_name='tagged_items', on_delete=models.CASCADE)
+class SectionTaggedItem(TaggedItemBase):
+    """The through model between Section and Tag"""
+    content_object = ParentalKey('Section', related_name='tagged_items', on_delete=models.CASCADE)
+
+
+class ArticleTaggedItem(TaggedItemBase):
+    """The through model between Article and Tag"""
+    content_object = ParentalKey('Article', related_name='tagged_items', on_delete=models.CASCADE)
+
+
+class SectionIndexPage(Page):
+    parent_page_types = ['home.HomePage']
+    subpage_types = ['home.Section']
 
 
 class Section(Page):
@@ -98,7 +108,8 @@ class Section(Page):
         blank=True,
         null=True,
     )
-    tags = ClusterTaggableManager(through=TaggedItem, blank=True)
+
+    tags = ClusterTaggableManager(through='SectionTaggedItem', blank=True)
     show_progress_bar = models.BooleanField(default=False)
 
     show_in_menus_default = True
@@ -179,7 +190,7 @@ class Article(Page, CommentableMixin):
         null=True
     )
 
-    tags = ClusterTaggableManager(through=TaggedItem, blank=True)
+    tags = ClusterTaggableManager(through='ArticleTaggedItem', blank=True)
     body = StreamField([
         ('heading', blocks.CharBlock(form_classname="full title")),
         ('paragraph', blocks.RichTextBlock()),

home/wagtail_hooks.py

@@ -11,7 +11,7 @@
 from wagtail.core.models import PageViewRestriction
 from wagtail.core.rich_text import LinkHandler
 
-from home.models import FooterIndexPage, Section
+from home.models import FooterIndexPage, BannerIndexPage, Section, SectionIndexPage
 
 
 class ExternalLinkHandler(LinkHandler, ABC):
@@ -38,9 +38,10 @@ def check_group(page, request, serve_args, serve_kwargs):
                     if not any(group in current_user_groups for group in restriction.groups.all()):
                         raise PermissionDenied
 
+
 @hooks.register('construct_explorer_page_queryset')
-def sort_footer_page_listing_by_path(parent_page, pages, request):
-    if isinstance(parent_page, FooterIndexPage):
+def sort_page_listing_by_path(parent_page, pages, request):
+    if isinstance(parent_page, (BannerIndexPage, FooterIndexPage, Section, SectionIndexPage)):
         pages = pages.order_by('path')
 
     return pages