diff --git a/hypha/apply/categories/models.py b/hypha/apply/categories/models.py index 5ca8d824085ebd9db409a84d1845f73ee30f494f..f65f867984245fbc9d2bfcc87c3df5b5a5bac105 100644 --- a/hypha/apply/categories/models.py +++ b/hypha/apply/categories/models.py @@ -6,8 +6,8 @@ from django.utils.translation import gettext_lazy as _ from modelcluster.fields import ParentalKey from modelcluster.models import ClusterableModel from treebeard.mp_tree import MP_Node -from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel from wagtail.admin.forms import WagtailAdminModelForm +from wagtail.admin.panels import FieldPanel, InlinePanel, MultiFieldPanel from wagtail.fields import RichTextField from wagtail.models import Orderable from wagtail.search import index diff --git a/hypha/apply/dashboard/wagtail_hooks.py b/hypha/apply/dashboard/wagtail_hooks.py index 6e776313f68c55a4a3858504172b6aeb56a79919..4925637e2db5d5f8dcf6604e776b645d1b11defd 100644 --- a/hypha/apply/dashboard/wagtail_hooks.py +++ b/hypha/apply/dashboard/wagtail_hooks.py @@ -1,8 +1,8 @@ from urllib.parse import urljoin from django.urls import reverse -from wagtail.admin.menu import MenuItem from wagtail import hooks +from wagtail.admin.menu import MenuItem from hypha.apply.home.models import ApplyHomePage diff --git a/hypha/apply/funds/admin_views.py b/hypha/apply/funds/admin_views.py index 093f38bad0dba710e6ae64d728b6094cd280a2fa..8e6344c49dce48189b9de2db649f78898e471a10 100644 --- a/hypha/apply/funds/admin_views.py +++ b/hypha/apply/funds/admin_views.py @@ -2,11 +2,11 @@ from django.contrib.admin.utils import unquote from django.core.exceptions import PermissionDenied from django.shortcuts import get_object_or_404, redirect from django.utils.translation import gettext as _ +from wagtail import hooks from wagtail.admin import messages from wagtail.admin.forms.pages import CopyForm from wagtail.admin.views.pages.utils import get_valid_next_url_from_request from wagtail.contrib.modeladmin.views import CreateView, EditView -from wagtail import hooks from wagtail.models import Page from hypha.apply.utils.blocks import show_admin_form_error_messages diff --git a/hypha/apply/funds/wagtail_hooks.py b/hypha/apply/funds/wagtail_hooks.py index 35cbe05b87630114b82eea69878995c36aeb605b..31debfeb0464743bac8cff0f5dfc048c23ed5521 100644 --- a/hypha/apply/funds/wagtail_hooks.py +++ b/hypha/apply/funds/wagtail_hooks.py @@ -1,6 +1,6 @@ from django.contrib.auth.models import Permission -from wagtail.contrib.modeladmin.options import modeladmin_register from wagtail import hooks +from wagtail.contrib.modeladmin.options import modeladmin_register from .admin import ApplyAdminGroup from .admin_views import custom_admin_round_copy_view diff --git a/hypha/public/forms/models.py b/hypha/public/forms/models.py index f10f76ba0768433e7bc8e1fa19c49db188c3b959..7c85d556da5e50a447d173947501ee46186e8adf 100644 --- a/hypha/public/forms/models.py +++ b/hypha/public/forms/models.py @@ -10,12 +10,7 @@ from django.utils.decorators import method_decorator from django.utils.translation import gettext_lazy as _ from django.views.decorators.cache import never_cache from modelcluster.fields import ParentalKey -from wagtail.admin.panels import ( - FieldPanel, - FieldRowPanel, - InlinePanel, - MultiFieldPanel, -) +from wagtail.admin.panels import FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel from wagtail.contrib.forms.forms import FormBuilder from wagtail.contrib.forms.models import ( FORM_FIELD_CHOICES, diff --git a/hypha/public/navigation/models.py b/hypha/public/navigation/models.py index bb206928969619d82e7586dc085444f47535e565..79fa4a4d268cd8370cd94c85af486f0230ae3c0e 100644 --- a/hypha/public/navigation/models.py +++ b/hypha/public/navigation/models.py @@ -1,8 +1,8 @@ from django.utils.translation import gettext_lazy as _ from modelcluster.models import ClusterableModel +from wagtail import blocks from wagtail.admin.panels import StreamFieldPanel from wagtail.contrib.settings.models import BaseSetting, register_setting -from wagtail import blocks from wagtail.fields import StreamField diff --git a/hypha/public/partner/models.py b/hypha/public/partner/models.py index 4ce4903a0aff0c6db1628fa2be2ada4685b5637d..4c7d128fbfd75b5614c9c5efd78441a7d50b4110 100644 --- a/hypha/public/partner/models.py +++ b/hypha/public/partner/models.py @@ -8,12 +8,12 @@ from django.http import Http404 from django.shortcuts import redirect from django.utils.translation import gettext_lazy as _ from pagedown.widgets import PagedownWidget -from wagtail.admin.panels import FieldPanel from wagtail.admin.forms import WagtailAdminModelForm +from wagtail.admin.panels import FieldPanel from wagtail.contrib.settings.models import BaseSetting, register_setting from wagtail.fields import RichTextField -from wagtail.models import Page from wagtail.images.edit_handlers import ImageChooserPanel +from wagtail.models import Page from wagtail.search import index from hypha.apply.categories.models import Category, Option diff --git a/hypha/public/people/management/commands/migrate_people.py b/hypha/public/people/management/commands/migrate_people.py index a76ce2dc153a9cecd1500c24d45e317ad7ae7b07..93f145022e082ca2ea42ca980c001f301ff98b3b 100644 --- a/hypha/public/people/management/commands/migrate_people.py +++ b/hypha/public/people/management/commands/migrate_people.py @@ -14,9 +14,9 @@ from django.db import transaction from django.db.utils import IntegrityError from PIL import Image from wagtail.admin.rich_text.converters.editor_html import EditorHTMLConverter +from wagtail.images import get_image_model from wagtail.models import Page from wagtail.rich_text import RichText -from wagtail.images import get_image_model from hypha.apply.categories.categories_seed import CATEGORIES from hypha.apply.categories.models import Category, Option diff --git a/hypha/public/people/models.py b/hypha/public/people/models.py index 66a61b8864afce2282a7e7e280d6e5e59ef77d66..9f7183b1af1ebcfb12c9b069b429645545cce1e2 100644 --- a/hypha/public/people/models.py +++ b/hypha/public/people/models.py @@ -14,8 +14,8 @@ from wagtail.admin.panels import ( StreamFieldPanel, ) from wagtail.fields import StreamField -from wagtail.models import Orderable, PageManager from wagtail.images.edit_handlers import ImageChooserPanel +from wagtail.models import Orderable, PageManager from wagtail.query import PageQuerySet from wagtail.search import index diff --git a/hypha/public/projects/management/commands/migrate_projects.py b/hypha/public/projects/management/commands/migrate_projects.py index ff75e1720275c18f9b821d95da74811600f9edd2..fc0cc0734ae653dbc1ab44115342ca2f7f98d39b 100644 --- a/hypha/public/projects/management/commands/migrate_projects.py +++ b/hypha/public/projects/management/commands/migrate_projects.py @@ -14,9 +14,9 @@ from django.db import transaction from django.db.utils import IntegrityError from PIL import Image from wagtail.admin.rich_text.converters.editor_html import EditorHTMLConverter +from wagtail.images import get_image_model from wagtail.models import Page from wagtail.rich_text import RichText -from wagtail.images import get_image_model from hypha.apply.categories.categories_seed import CATEGORIES from hypha.apply.categories.models import Category, Option diff --git a/hypha/public/utils/models.py b/hypha/public/utils/models.py index f5b5f8c6416665dd18fca4136048a1dabacae486..48ceca0766ab1ca2fa7d072d16a6b636b7ca8029 100644 --- a/hypha/public/utils/models.py +++ b/hypha/public/utils/models.py @@ -3,6 +3,7 @@ from django.core.exceptions import ValidationError from django.db import models from django.utils.decorators import method_decorator from django.utils.translation import gettext_lazy as _ +from wagtail import blocks from wagtail.admin.panels import ( FieldPanel, FieldRowPanel, @@ -12,10 +13,9 @@ from wagtail.admin.panels import ( StreamFieldPanel, ) from wagtail.contrib.settings.models import BaseSetting, register_setting -from wagtail import blocks from wagtail.fields import RichTextField, StreamField -from wagtail.models import Orderable, Page from wagtail.images.edit_handlers import ImageChooserPanel +from wagtail.models import Orderable, Page from wagtail.snippets.models import register_snippet from wagtailcache.cache import WagtailCacheMixin, cache_page diff --git a/hypha/public/utils/templatetags/util_tags.py b/hypha/public/utils/templatetags/util_tags.py index 0e11dda0e9b0acd2e62b84e9666110b3cbd61873..a54a23fd683b85a208004922e76d4d3fd9931e84 100644 --- a/hypha/public/utils/templatetags/util_tags.py +++ b/hypha/public/utils/templatetags/util_tags.py @@ -1,6 +1,6 @@ from django import template -from wagtail.models import Page from wagtail.coreutils import camelcase_to_underscore +from wagtail.models import Page from hypha.public.home.models import HomePage from hypha.public.utils.models import SocialMediaSettings, SystemMessagesSettings diff --git a/hypha/public/utils/wagtail_hooks.py b/hypha/public/utils/wagtail_hooks.py index c2ffbaf8fe8d164a6824c40a866cbef9fb8da48a..e71427ca1c5262a327868195c54c8fd177ed2e59 100644 --- a/hypha/public/utils/wagtail_hooks.py +++ b/hypha/public/utils/wagtail_hooks.py @@ -1,10 +1,10 @@ from django.templatetags.static import static +from wagtail import hooks from wagtail.contrib.modeladmin.options import ( ModelAdmin, ModelAdminGroup, modeladmin_register, ) -from wagtail import hooks from wagtailcache.cache import clear_cache from hypha.public.news.models import NewsType diff --git a/hypha/urls.py b/hypha/urls.py index 8d8d3e5a308787f31134b5a0b8d8ad2726744e4e..f162b6f0a1e4f43b09393d58848017985e249059 100644 --- a/hypha/urls.py +++ b/hypha/urls.py @@ -4,9 +4,9 @@ from django.urls import include, path, re_path from django.views.generic import TemplateView from django_file_form import urls as django_file_form_urls from two_factor.views import LoginView +from wagtail import urls as wagtail_urls from wagtail.admin import urls as wagtailadmin_urls from wagtail.contrib.sitemaps.views import sitemap -from wagtail import urls as wagtail_urls from wagtail.documents import urls as wagtaildocs_urls from wagtail.images.views.serve import ServeView