Remove deprecated Panel internals

pull/9956/head
Matt Westcott 2023-01-30 17:48:44 +00:00 zatwierdzone przez Matt Westcott
rodzic 1a0344216c
commit f9391de81a
2 zmienionych plików z 1 dodań i 76 usunięć

Wyświetl plik

@ -1,5 +1,3 @@
from warnings import warn
from django.core.exceptions import ImproperlyConfigured
from django.utils.safestring import mark_safe
@ -10,7 +8,6 @@ from wagtail.admin.forms.models import (
from wagtail.admin.ui.components import Component
from wagtail.coreutils import safe_snake_case
from wagtail.models import DraftStateMixin
from wagtail.utils.deprecation import RemovedInWagtail50Warning
def get_form_for_model(
@ -98,55 +95,8 @@ class Panel:
that this panel can use.
This will only be called after binding to a model (i.e. self.model is available).
"""
options = {}
if not getattr(self.widget_overrides, "is_original_method", False):
warn(
"The `widget_overrides` method (on %r) is deprecated; "
"these should be returned from `get_form_options` as a "
"`widgets` item instead." % type(self),
category=RemovedInWagtail50Warning,
)
options["widgets"] = self.widget_overrides()
if not getattr(self.required_fields, "is_original_method", False):
warn(
"The `required_fields` method (on %r) is deprecated; "
"these should be returned from `get_form_options` as a "
"`fields` item instead." % type(self),
category=RemovedInWagtail50Warning,
)
options["fields"] = self.required_fields()
if not getattr(self.required_formsets, "is_original_method", False):
warn(
"The `required_formsets` method (on %r) is deprecated; "
"these should be returned from `get_form_options` as a "
"`formsets` item instead." % type(self),
category=RemovedInWagtail50Warning,
)
options["formsets"] = self.required_formsets()
return options
# RemovedInWagtail50Warning - edit handlers should override get_form_options instead
def widget_overrides(self):
return {}
widget_overrides.is_original_method = True
# RemovedInWagtail50Warning - edit handlers should override get_form_options instead
def required_fields(self):
return []
required_fields.is_original_method = True
# RemovedInWagtail50Warning - edit handlers should override get_form_options instead
def required_formsets(self):
return {}
required_formsets.is_original_method = True
def get_form_class(self):
"""
Construct a form class that has all the fields and formsets named in
@ -174,15 +124,6 @@ class Panel:
new.on_model_bound()
return new
def bind_to(self, model=None, instance=None, request=None, form=None):
warn(
"The %s.bind_to() method has been replaced by bind_to_model(model) and get_bound_panel(instance=instance, request=request, form=form)"
% type(self).__name__,
category=RemovedInWagtail50Warning,
stacklevel=2,
)
return self.get_bound_panel(instance=instance, request=request, form=form)
def get_bound_panel(self, instance=None, request=None, form=None, prefix="panel"):
"""
Return a ``BoundPanel`` instance that can be rendered onto the template as a component. By default, this creates an instance
@ -300,22 +241,6 @@ class Panel:
def is_required(self):
return False
def render_as_object(self):
warn(
"Panel.render_as_object is deprecated. Use render_html instead",
category=RemovedInWagtail50Warning,
stacklevel=2,
)
return self.render_html()
def render_as_field(self):
warn(
"Panel.render_as_field is deprecated. Use render_html instead",
category=RemovedInWagtail50Warning,
stacklevel=2,
)
return self.render_html()
def get_context_data(self, parent_context=None):
context = super().get_context_data(parent_context)
context["self"] = self

Wyświetl plik

@ -1287,7 +1287,7 @@ class TestInlinePanelGetComparison(TestCase):
page = Page.objects.get(id=4).specific
comparison = (
page.get_edit_handler()
.bind_to(instance=page, request=self.request)
.get_bound_panel(instance=page, request=self.request)
.get_comparison()
)