Skip to content

silent w002 warning #510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fabienheureux wants to merge 1 commit into
base: master
Choose a base branch
from
Open

silent w002 warning #510

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions wagtailmenus/models/menus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy as _
from modelcluster.models import ClusterableModel
from wagtail import hooks
from wagtail import hooks, VERSION as WAGTAIL_VERSION
from wagtail.models import Page, Site

from wagtailmenus import forms, panels
Expand Down Expand Up @@ -1045,7 +1045,10 @@ def get_context_data(self, **kwargs):
data.update(kwargs)
return super().get_context_data(**data)

settings_panels = panels.menu_settings_panels
if WAGTAIL_VERSION < (5, 2):
settings_panels = panels.menu_settings_panels
else:
panels = panels.menu_settings_panels


# ########################################################
Expand All @@ -1056,7 +1059,10 @@ class AbstractMainMenu(DefinesSubMenuTemplatesMixin, MenuWithMenuItems):
menu_short_name = 'main' # used to find templates
menu_instance_context_name = 'main_menu'
related_templatetag_name = 'main_menu'
content_panels = panels.main_menu_content_panels
if WAGTAIL_VERSION < (5, 2):
content_panels = panels.main_menu_content_panels
else:
panels = MenuWithMenuItems.panels + panels.main_menu_content_panels
menu_items_relation_setting_name = 'MAIN_MENU_ITEMS_RELATED_NAME'

site = models.OneToOneField(
Expand Down Expand Up @@ -1132,7 +1138,10 @@ class AbstractFlatMenu(DefinesSubMenuTemplatesMixin, MenuWithMenuItems):
menu_instance_context_name = 'flat_menu'
related_templatetag_name = 'flat_menu'
base_form_class = forms.FlatMenuAdminForm
content_panels = panels.flat_menu_content_panels
if WAGTAIL_VERSION < (5, 2):
content_panels = panels.flat_menu_content_panels
else:
panels = MenuWithMenuItems.panels + panels.flat_menu_content_panels
menu_items_relation_setting_name = 'FLAT_MENU_ITEMS_RELATED_NAME'

site = models.ForeignKey(
Expand Down