Skip to content

Commit ffbb835

Browse files
istrideistride
authored
Upgrade to Wagtail v3.0.3 (#1682)
1 parent 7d6b94d commit ffbb835

File tree

81 files changed

+1481
-545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1481
-545
lines changed

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Internet of Good Things ([IoGT][2]) is developed as a public good under a [BSD-2
44

55
The development uses the Python programming language, building on the [Django][4] server-side web framework combined with the [Wagtail][5] content management system.
66

7-
In line with the latest Wagtail [Long Term Support release][6], IoGT 2.x supports:
8-
- Wagtail 2.15.x
9-
- Django 3.0.x, 3.1.x and 3.2.x
10-
- Python 3.8, 3.9 and 3.10
11-
- PostgreSQL, MySQL and SQLite as database backends
7+
IoGT 2.x requires:
8+
- Wagtail 3.0.3
9+
- Django 3.2
10+
- Python 3.9+
11+
- PostgreSQL (14+), MySQL and SQLite (3.38+) as database backends
1212

1313
## Getting started
1414

‎comments/models.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from django.utils import timezone
66
from django_comments.signals import comment_was_flagged
77
from django_comments_xtd.models import XtdComment
8-
from wagtail.admin.edit_handlers import FieldPanel
9-
from wagtail.core.models import Page
8+
from wagtail.admin.panels import FieldPanel
9+
from wagtail.models import Page
1010

1111
from comments import get_comments_moderation_class
1212

‎home/blocks.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from django.utils.safestring import mark_safe
55
from django.utils.translation import gettext as _
66

7-
from wagtail.core import blocks
8-
from wagtail.core.blocks import PageChooserBlock
7+
from wagtail import blocks
8+
from wagtail.blocks import PageChooserBlock
99
from wagtail.images.blocks import ImageChooserBlock
1010
from wagtailmarkdown.utils import render_markdown
1111
from wagtailmedia.blocks import AbstractMediaChooserBlock

‎home/factories.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import factory
22
from django.core.files.base import ContentFile
33
from factory.django import DjangoModelFactory, ImageField
4-
from wagtail.core.models import Locale
4+
from wagtail.models import Locale
55
from wagtail_factories import (
66
ImageChooserBlockFactory,
77
ImageFactory,

‎home/management/commands/check_multiple_translation_sources.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from django.core.management import BaseCommand
2-
from wagtail.core.models import Page
2+
from wagtail.models import Page
33
from wagtail_localize.models import TranslationSource
44

55

‎home/management/commands/create_default_site.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from django.contrib.sites.models import Site as DjangoSite
33
from django.core.management.base import BaseCommand
44
from home.models import HomePage
5-
from wagtail.core.models import Site as WagtailSite
5+
from wagtail.models import Site as WagtailSite
66

77

88
class Command(BaseCommand):

‎home/management/commands/create_initial_data.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from django.core import management
99
from django.core.files.images import ImageFile
1010
from django.core.management.base import BaseCommand
11-
from wagtail.core.models import Site, Page
12-
from wagtail.core.rich_text import RichText
11+
from wagtail.models import Site, Page
12+
from wagtail.rich_text import RichText
1313
from wagtail.images.models import Image
1414

1515
import home.models as models

‎home/management/commands/create_initial_menu.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from django.conf import settings
44
from django.core.files import File
55
from django.core.management.base import BaseCommand
6-
from wagtail.core.models import Site, Locale
6+
from wagtail.models import Site, Locale
77
from wagtailmenus.models import FlatMenu
88
from wagtailsvg.models import Svg
99

‎home/management/commands/sync_translated_pages.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.core.exceptions import ValidationError
22
from django.core.management.base import BaseCommand
3-
from wagtail.core.models import Page
3+
from wagtail.models import Page
44
from wagtail_localize.models import TranslationSource
55

66

‎home/management/commands/update_show_in_menu.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.core.management.base import BaseCommand
22

3-
from wagtail.core.models import Page
3+
from wagtail.models import Page
44

55
from home.models import HomePage, Section, Article, PageLinkPage
66
from questionnaires.models import Poll, Quiz, Survey

‎home/migrations/0001_initial.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import home.blocks
66
import home.mixins
77
import messaging.blocks
8-
import wagtail.core.blocks
9-
import wagtail.core.fields
8+
import wagtail.blocks
9+
import wagtail.fields
1010
import wagtail.images.blocks
1111
import wagtailmarkdown.blocks
1212
import wagtailmenus.models.menuitems
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
2626
fields=[
2727
('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')),
2828
('allow_comments', models.BooleanField(default=False)),
29-
('body', wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(form_classname='full title')), ('paragraph', wagtail.core.blocks.RichTextBlock(features=['h2', 'h3', 'h4', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image'])), ('markdown', wagtailmarkdown.blocks.MarkdownBlock(icon='code')), ('image', wagtail.images.blocks.ImageChooserBlock()), ('list', wagtail.core.blocks.ListBlock(wagtail.core.blocks.CharBlock(label='Item'))), ('numbered_list', wagtail.core.blocks.ListBlock(wagtail.core.blocks.CharBlock(label='Item'))), ('page_button', wagtail.core.blocks.StructBlock([('page', wagtail.core.blocks.PageChooserBlock()), ('text', wagtail.core.blocks.CharBlock(max_length=255, required=False))])), ('embedded_poll', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Poll'])), ('embedded_survey', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Survey'])), ('embedded_quiz', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Quiz'])), ('media', home.blocks.MediaBlock(icon='media')), ('chat_bot', wagtail.core.blocks.StructBlock([('subject', wagtail.core.blocks.CharBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('trigger_string', wagtail.core.blocks.CharBlock()), ('channel', messaging.blocks.ChatBotChannelChooserBlock())]))])),
29+
('body', wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock(form_classname='full title')), ('paragraph', wagtail.blocks.RichTextBlock(features=['h2', 'h3', 'h4', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image'])), ('markdown', wagtailmarkdown.blocks.MarkdownBlock(icon='code')), ('image', wagtail.images.blocks.ImageChooserBlock()), ('list', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Item'))), ('numbered_list', wagtail.blocks.ListBlock(wagtail.blocks.CharBlock(label='Item'))), ('page_button', wagtail.blocks.StructBlock([('page', wagtail.blocks.PageChooserBlock()), ('text', wagtail.blocks.CharBlock(max_length=255, required=False))])), ('embedded_poll', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Poll'])), ('embedded_survey', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Survey'])), ('embedded_quiz', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Quiz'])), ('media', home.blocks.MediaBlock(icon='media')), ('chat_bot', wagtail.blocks.StructBlock([('subject', wagtail.blocks.CharBlock()), ('button_text', wagtail.blocks.CharBlock()), ('trigger_string', wagtail.blocks.CharBlock()), ('channel', messaging.blocks.ChatBotChannelChooserBlock())]))])),
3030
],
3131
options={
3232
'abstract': False,
@@ -67,7 +67,7 @@ class Migration(migrations.Migration):
6767
name='BannerPage',
6868
fields=[
6969
('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')),
70-
('banner_description', wagtail.core.fields.RichTextField(blank=True, null=True)),
70+
('banner_description', wagtail.fields.RichTextField(blank=True, null=True)),
7171
('banner_button_text', models.CharField(blank=True, help_text='The title for a button', max_length=35, null=True)),
7272
('align_center', models.BooleanField(default=False)),
7373
],
@@ -111,7 +111,7 @@ class Migration(migrations.Migration):
111111
name='HomePage',
112112
fields=[
113113
('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')),
114-
('home_featured_content', wagtail.core.fields.StreamField([('page_button', wagtail.core.blocks.StructBlock([('page', wagtail.core.blocks.PageChooserBlock()), ('text', wagtail.core.blocks.CharBlock(max_length=255, required=False))])), ('embedded_poll', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Poll'])), ('embedded_survey', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Survey'])), ('embedded_quiz', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Quiz']))], null=True)),
114+
('home_featured_content', wagtail.fields.StreamField([('page_button', wagtail.blocks.StructBlock([('page', wagtail.blocks.PageChooserBlock()), ('text', wagtail.blocks.CharBlock(max_length=255, required=False))])), ('embedded_poll', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Poll'])), ('embedded_survey', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Survey'])), ('embedded_quiz', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Quiz']))], null=True)),
115115
],
116116
options={
117117
'abstract': False,
@@ -202,8 +202,8 @@ class Migration(migrations.Migration):
202202
('global_ga_tag_manager', models.CharField(blank=True, help_text='Global GA Tag Manager tracking code (e.g GTM-XXX) to be used to view analytics on more than one site globally', max_length=255, null=True, verbose_name='Global GA Tag Manager')),
203203
('local_ga_tracking_code', models.CharField(blank=True, help_text='Local GA tracking code to be used to view analytics on this site only', max_length=255, null=True, verbose_name='Local GA Tracking Code')),
204204
('global_ga_tracking_code', models.CharField(blank=True, help_text='Global GA tracking code to be used to view analytics on more than one site globally', max_length=255, null=True, verbose_name='Global GA Tracking Code')),
205-
('social_media_link', wagtail.core.fields.StreamField([('social_media_link', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(max_length=255)), ('link', wagtail.core.blocks.URLBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())]))], blank=True, null=True)),
206-
('social_media_content_sharing_button', wagtail.core.fields.StreamField([('social_media_content_sharing_button', wagtail.core.blocks.StructBlock([('platform', wagtail.core.blocks.CharBlock(max_length=255)), ('is_active', wagtail.core.blocks.BooleanBlock(required=False)), ('image', wagtail.images.blocks.ImageChooserBlock(required=False))]))], blank=True, null=True)),
205+
('social_media_link', wagtail.fields.StreamField([('social_media_link', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(max_length=255)), ('link', wagtail.blocks.URLBlock()), ('image', wagtail.images.blocks.ImageChooserBlock())]))], blank=True, null=True)),
206+
('social_media_content_sharing_button', wagtail.fields.StreamField([('social_media_content_sharing_button', wagtail.blocks.StructBlock([('platform', wagtail.blocks.CharBlock(max_length=255)), ('is_active', wagtail.blocks.BooleanBlock(required=False)), ('image', wagtail.images.blocks.ImageChooserBlock(required=False))]))], blank=True, null=True)),
207207
('media_file_size_threshold', models.IntegerField(default=9437184, help_text='Show warning if uploaded media file size is greater than this in bytes. Default is 9 MB')),
208208
('allow_anonymous_comment', models.BooleanField(default=False)),
209209
('logo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image')),

‎home/migrations/0025_auto_20211029_1634.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from django.db import migrations, models
44
import home.blocks
55
import messaging.blocks
6-
import wagtail.core.blocks
7-
import wagtail.core.fields
6+
import wagtail.blocks
7+
import wagtail.fields
88
import wagtail.images.blocks
99
import wagtailmarkdown.blocks
1010

@@ -24,11 +24,11 @@ class Migration(migrations.Migration):
2424
migrations.AlterField(
2525
model_name='article',
2626
name='body',
27-
field=wagtail.core.fields.StreamField([('heading', wagtail.core.blocks.CharBlock(form_classname='full title')), ('paragraph', wagtail.core.blocks.RichTextBlock(features=['h2', 'h3', 'h4', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image'])), ('markdown', wagtailmarkdown.blocks.MarkdownBlock(icon='code')), ('paragraph_v1_legacy', home.blocks.RawHTMLBlock(icon='code')), ('image', wagtail.images.blocks.ImageChooserBlock()), ('list', wagtail.core.blocks.ListBlock(wagtailmarkdown.blocks.MarkdownBlock(icon='code'))), ('numbered_list', home.blocks.NumberedListBlock(wagtailmarkdown.blocks.MarkdownBlock(icon='code'))), ('page_button', wagtail.core.blocks.StructBlock([('page', wagtail.core.blocks.PageChooserBlock()), ('text', wagtail.core.blocks.CharBlock(max_length=255, required=False))])), ('embedded_poll', wagtail.core.blocks.StructBlock([('direct_display', wagtail.core.blocks.BooleanBlock(required=False)), ('poll', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Poll']))])), ('embedded_survey', wagtail.core.blocks.StructBlock([('direct_display', wagtail.core.blocks.BooleanBlock(required=False)), ('survey', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Survey']))])), ('embedded_quiz', wagtail.core.blocks.StructBlock([('direct_display', wagtail.core.blocks.BooleanBlock(required=False)), ('quiz', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Quiz']))])), ('media', home.blocks.MediaBlock(icon='media')), ('chat_bot', wagtail.core.blocks.StructBlock([('subject', wagtail.core.blocks.CharBlock()), ('button_text', wagtail.core.blocks.CharBlock()), ('trigger_string', wagtail.core.blocks.CharBlock()), ('channel', messaging.blocks.ChatBotChannelChooserBlock())]))]),
27+
field=wagtail.fields.StreamField([('heading', wagtail.blocks.CharBlock(form_classname='full title')), ('paragraph', wagtail.blocks.RichTextBlock(features=['h2', 'h3', 'h4', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image'])), ('markdown', wagtailmarkdown.blocks.MarkdownBlock(icon='code')), ('paragraph_v1_legacy', home.blocks.RawHTMLBlock(icon='code')), ('image', wagtail.images.blocks.ImageChooserBlock()), ('list', wagtail.blocks.ListBlock(wagtailmarkdown.blocks.MarkdownBlock(icon='code'))), ('numbered_list', home.blocks.NumberedListBlock(wagtailmarkdown.blocks.MarkdownBlock(icon='code'))), ('page_button', wagtail.blocks.StructBlock([('page', wagtail.blocks.PageChooserBlock()), ('text', wagtail.blocks.CharBlock(max_length=255, required=False))])), ('embedded_poll', wagtail.blocks.StructBlock([('direct_display', wagtail.blocks.BooleanBlock(required=False)), ('poll', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Poll']))])), ('embedded_survey', wagtail.blocks.StructBlock([('direct_display', wagtail.blocks.BooleanBlock(required=False)), ('survey', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Survey']))])), ('embedded_quiz', wagtail.blocks.StructBlock([('direct_display', wagtail.blocks.BooleanBlock(required=False)), ('quiz', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Quiz']))])), ('media', home.blocks.MediaBlock(icon='media')), ('chat_bot', wagtail.blocks.StructBlock([('subject', wagtail.blocks.CharBlock()), ('button_text', wagtail.blocks.CharBlock()), ('trigger_string', wagtail.blocks.CharBlock()), ('channel', messaging.blocks.ChatBotChannelChooserBlock())]))]),
2828
),
2929
migrations.AlterField(
3030
model_name='homepage',
3131
name='home_featured_content',
32-
field=wagtail.core.fields.StreamField([('page_button', wagtail.core.blocks.StructBlock([('page', wagtail.core.blocks.PageChooserBlock()), ('text', wagtail.core.blocks.CharBlock(max_length=255, required=False))])), ('embedded_poll', wagtail.core.blocks.StructBlock([('direct_display', wagtail.core.blocks.BooleanBlock(required=False)), ('poll', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Poll']))])), ('embedded_survey', wagtail.core.blocks.StructBlock([('direct_display', wagtail.core.blocks.BooleanBlock(required=False)), ('survey', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Survey']))])), ('embedded_quiz', wagtail.core.blocks.StructBlock([('direct_display', wagtail.core.blocks.BooleanBlock(required=False)), ('quiz', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Quiz']))])), ('article', wagtail.core.blocks.StructBlock([('display_section_title', wagtail.core.blocks.BooleanBlock(required=False)), ('article', wagtail.core.blocks.PageChooserBlock(page_type=['home.Article']))]))], null=True),
32+
field=wagtail.fields.StreamField([('page_button', wagtail.blocks.StructBlock([('page', wagtail.blocks.PageChooserBlock()), ('text', wagtail.blocks.CharBlock(max_length=255, required=False))])), ('embedded_poll', wagtail.blocks.StructBlock([('direct_display', wagtail.blocks.BooleanBlock(required=False)), ('poll', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Poll']))])), ('embedded_survey', wagtail.blocks.StructBlock([('direct_display', wagtail.blocks.BooleanBlock(required=False)), ('survey', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Survey']))])), ('embedded_quiz', wagtail.blocks.StructBlock([('direct_display', wagtail.blocks.BooleanBlock(required=False)), ('quiz', home.blocks.EmbeddedQuestionnaireChooserBlock(page_type=['questionnaires.Quiz']))])), ('article', wagtail.blocks.StructBlock([('display_section_title', wagtail.blocks.BooleanBlock(required=False)), ('article', wagtail.blocks.PageChooserBlock(page_type=['home.Article']))]))], null=True),
3333
),
3434
]

0 commit comments

Comments
 (0)