Skip to content

Commit

Permalink
updated for wagtail 5
Browse files Browse the repository at this point in the history
  • Loading branch information
OmegaDroid committed Jan 15, 2025
1 parent 71fe3ac commit 8afeebb
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 24 deletions.
11 changes: 5 additions & 6 deletions blog/abstract.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"),
]
4 changes: 2 additions & 2 deletions blog/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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={
Expand Down
8 changes: 4 additions & 4 deletions blog/migrations/0001_squashed_0006_auto_20180206_2239.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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={
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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'),
),
]
4 changes: 2 additions & 2 deletions blog/migrations/0004_auto_20150427_2047.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions blog/migrations/0006_auto_20180206_2239.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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'),
),
]
2 changes: 1 addition & 1 deletion blog/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion blog/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion blog/wordpress_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions demo/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
'modelcluster',
'rest_framework',

'wagtail.core',
'wagtail',
'wagtail.admin',
'wagtail.documents',
'wagtail.snippets',
Expand All @@ -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',
)

Expand Down
2 changes: 1 addition & 1 deletion demo/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -22,7 +22,7 @@ packages = [
[tool.poetry.dependencies]
python = "^3.6"
Django = "*"
wagtail = "^2"
wagtail = "^5"
requests = "*"
lxml = "*"

Expand Down

0 comments on commit 8afeebb

Please sign in to comment.