From 8afeebb553863a0c62203456f0b303e5f7dfeffe Mon Sep 17 00:00:00 2001 From: Dan Bate Date: Wed, 15 Jan 2025 08:45:21 +0000 Subject: [PATCH] updated for wagtail 5 --- blog/abstract.py | 11 +++++------ blog/migrations/0001_initial.py | 4 ++-- .../0001_squashed_0006_auto_20180206_2239.py | 8 ++++---- blog/migrations/0004_auto_20150427_2047.py | 4 ++-- blog/migrations/0006_auto_20180206_2239.py | 4 ++-- blog/models.py | 2 +- blog/tests.py | 2 +- blog/wordpress_import.py | 2 +- demo/settings.py | 4 ++-- demo/urls.py | 2 +- pyproject.toml | 4 ++-- 11 files changed, 23 insertions(+), 24 deletions(-) diff --git a/blog/abstract.py b/blog/abstract.py index 15d8d99..ed25016 100644 --- a/blog/abstract.py +++ b/blog/abstract.py @@ -1,14 +1,13 @@ from django.conf import settings from django.db import models from django.db.models import Q -from django.utils.translation import ugettext_lazy as _ -from wagtail.admin.edit_handlers import ( +from django.utils.translation import gettext_lazy as _ +from wagtail.admin.panels import ( FieldPanel, InlinePanel, MultiFieldPanel, FieldRowPanel) from wagtail.api import APIField -from wagtail.core.models import Page -from wagtail.core.fields import RichTextField +from wagtail.models import Page +from wagtail.fields import RichTextField from wagtail.images import get_image_model_string -from wagtail.images.edit_handlers import ImageChooserPanel from wagtail.search import index from modelcluster.fields import ParentalKey, ParentalManyToManyField from modelcluster.tags import ClusterTaggableManager @@ -171,6 +170,6 @@ class Meta: FieldPanel('tags'), FieldPanel('blog_categories'), ], heading="Tags and Categories"), - ImageChooserPanel('header_image'), + FieldPanel('header_image'), FieldPanel('body', classname="full"), ] diff --git a/blog/migrations/0001_initial.py b/blog/migrations/0001_initial.py index f00b5e9..e679b3a 100644 --- a/blog/migrations/0001_initial.py +++ b/blog/migrations/0001_initial.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import wagtail.core.fields +import wagtail.fields import django.db.models.deletion import modelcluster.fields import modelcluster.tags @@ -56,7 +56,7 @@ class Migration(migrations.Migration): name='BlogPage', fields=[ ('page_ptr', models.OneToOneField(serialize=False, to='wagtailcore.Page', primary_key=True, auto_created=True, parent_link=True, on_delete=models.CASCADE)), - ('body', wagtail.core.fields.RichTextField()), + ('body', wagtail.fields.RichTextField()), ('header_image', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image', blank=True)), ], options={ diff --git a/blog/migrations/0001_squashed_0006_auto_20180206_2239.py b/blog/migrations/0001_squashed_0006_auto_20180206_2239.py index 9fdb3b1..bb9f992 100644 --- a/blog/migrations/0001_squashed_0006_auto_20180206_2239.py +++ b/blog/migrations/0001_squashed_0006_auto_20180206_2239.py @@ -9,7 +9,7 @@ import django.db.models.deletion import modelcluster.contrib.taggit import modelcluster.fields -import wagtail.core.fields +import wagtail.fields # Functions from the following migrations need manual copying. @@ -70,7 +70,7 @@ class Migration(migrations.Migration): name='BlogPage', 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')), - ('body', wagtail.core.fields.RichTextField()), + ('body', wagtail.fields.RichTextField()), ('header_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -139,7 +139,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='blogpage', name='body', - field=wagtail.core.fields.RichTextField(verbose_name='body'), + field=wagtail.fields.RichTextField(verbose_name='body'), ), migrations.AlterField( model_name='blogpage', @@ -178,6 +178,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='blogpage', name='body', - field=wagtail.core.fields.RichTextField(blank=True, verbose_name='body'), + field=wagtail.fields.RichTextField(blank=True, verbose_name='body'), ), ] diff --git a/blog/migrations/0004_auto_20150427_2047.py b/blog/migrations/0004_auto_20150427_2047.py index a7d8e06..b32073a 100644 --- a/blog/migrations/0004_auto_20150427_2047.py +++ b/blog/migrations/0004_auto_20150427_2047.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.db import models, migrations -import wagtail.core.fields +import wagtail.fields import django.db.models.deletion @@ -46,7 +46,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='blogpage', name='body', - field=wagtail.core.fields.RichTextField(verbose_name='body'), + field=wagtail.fields.RichTextField(verbose_name='body'), preserve_default=True, ), migrations.AlterField( diff --git a/blog/migrations/0006_auto_20180206_2239.py b/blog/migrations/0006_auto_20180206_2239.py index e198795..7bd6305 100644 --- a/blog/migrations/0006_auto_20180206_2239.py +++ b/blog/migrations/0006_auto_20180206_2239.py @@ -5,7 +5,7 @@ from django.conf import settings from django.db import migrations, models import django.db.models.deletion -import wagtail.core.fields +import wagtail.fields class Migration(migrations.Migration): @@ -23,6 +23,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='blogpage', name='body', - field=wagtail.core.fields.RichTextField(blank=True, verbose_name='body'), + field=wagtail.fields.RichTextField(blank=True, verbose_name='body'), ), ] diff --git a/blog/models.py b/blog/models.py index 8aba2a3..a518b7c 100644 --- a/blog/models.py +++ b/blog/models.py @@ -3,7 +3,7 @@ from django.conf import settings from django.contrib.auth import get_user_model from django.db.models import Count -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.shortcuts import get_object_or_404 from django.template.defaultfilters import slugify from wagtail.snippets.models import register_snippet diff --git a/blog/tests.py b/blog/tests.py index 824a8de..82eab9d 100644 --- a/blog/tests.py +++ b/blog/tests.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import User from django.test import TestCase from django_comments_xtd.models import XtdComment -from wagtail.core.models import Page +from wagtail.models import Page import responses from .models import ( diff --git a/blog/wordpress_import.py b/blog/wordpress_import.py index 4d3e940..033f8ce 100644 --- a/blog/wordpress_import.py +++ b/blog/wordpress_import.py @@ -8,7 +8,7 @@ import requests from django.core.files import File from django.contrib.auth import get_user_model -from wagtail.core.models import Page +from wagtail.models import Page from wagtail.images.models import Image from .models import BlogPage, BlogCategory, BlogTag diff --git a/demo/settings.py b/demo/settings.py index 8b13f96..25cb454 100644 --- a/demo/settings.py +++ b/demo/settings.py @@ -43,7 +43,7 @@ 'modelcluster', 'rest_framework', - 'wagtail.core', + 'wagtail', 'wagtail.admin', 'wagtail.documents', 'wagtail.snippets', @@ -67,7 +67,7 @@ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'wagtail.core.middleware.SiteMiddleware', + 'wagtail.middleware.SiteMiddleware', 'wagtail.contrib.redirects.middleware.RedirectMiddleware', ) diff --git a/demo/urls.py b/demo/urls.py index 4d7efc0..3cee99d 100644 --- a/demo/urls.py +++ b/demo/urls.py @@ -4,7 +4,7 @@ from django.contrib import admin from django.views.generic.base import RedirectView -from wagtail.core import urls as wagtail_urls +from wagtail import urls as wagtail_urls from wagtail.admin import urls as wagtailadmin_urls from wagtail.documents import urls as wagtaildocs_urls from wagtail.search.signal_handlers import register_signal_handlers as wagtailsearch_register_signal_handlers diff --git a/pyproject.toml b/pyproject.toml index ad8fb36..5e5da82 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wagtail_blog" -version = "2.3.5" +version = "3.0.0" description = "A wordpress like blog app implemented in wagtail" authors = ["David Burke"] license = "Apache License" @@ -22,7 +22,7 @@ packages = [ [tool.poetry.dependencies] python = "^3.6" Django = "*" -wagtail = "^2" +wagtail = "^5" requests = "*" lxml = "*"