1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Refs #32339 -- Changed default form and formset rendering style to div-based.

Per deprecation timeline.

This also removes "django/forms/default.html" and
"django/forms/formsets/default.html" templates.
This commit is contained in:
Mariusz Felisiak
2023-01-13 09:32:35 +01:00
parent b5ac6e78f8
commit 98756c685e
13 changed files with 12 additions and 96 deletions

View File

@@ -32,8 +32,6 @@ class ManagementForm(Form):
as well.
"""
template_name = "django/forms/div.html" # RemovedInDjango50Warning.
TOTAL_FORMS = IntegerField(widget=HiddenInput)
INITIAL_FORMS = IntegerField(widget=HiddenInput)
# MIN_NUM_FORM_COUNT and MAX_NUM_FORM_COUNT are output with the rest of the

View File

@@ -1 +0,0 @@
{% include "django/forms/table.html" %}

View File

@@ -1 +0,0 @@
{{ formset.management_form }}{% for form in formset %}{{ form }}{% endfor %}

View File

@@ -15,11 +15,8 @@ def get_default_renderer():
class BaseRenderer:
# RemovedInDjango50Warning: When the deprecation ends, replace with
# form_template_name = "django/forms/div.html"
# formset_template_name = "django/forms/formsets/div.html"
form_template_name = "django/forms/default.html"
formset_template_name = "django/forms/formsets/default.html"
form_template_name = "django/forms/div.html"
formset_template_name = "django/forms/formsets/div.html"
def get_template(self, template_name):
raise NotImplementedError("subclasses must implement get_template()")

View File

@@ -1 +0,0 @@
{% include "django/forms/table.html" %}

View File

@@ -1 +0,0 @@
{{ formset.management_form }}{% for form in formset %}{{ form }}{% endfor %}

View File

@@ -1,16 +1,13 @@
import json
import warnings
from collections import UserList
from django.conf import settings
from django.core.exceptions import ValidationError
from django.forms.renderers import get_default_renderer
from django.utils import timezone
from django.utils.deprecation import RemovedInDjango50Warning
from django.utils.html import escape, format_html_join
from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy as _
from django.utils.version import get_docs_version
def pretty_name(name):
@@ -45,16 +42,6 @@ def flatatt(attrs):
)
DEFAULT_TEMPLATE_DEPRECATION_MSG = (
'The "default.html" templates for forms and formsets will be removed. These were '
'proxies to the equivalent "table.html" templates, but the new "div.html" '
"templates will be the default from Django 5.0. Transitional renderers are "
"provided to allow you to opt-in to the new output style now. See "
"https://docs.djangoproject.com/en/%s/releases/4.1/ for more details"
% get_docs_version()
)
class RenderableMixin:
def get_context(self):
raise NotImplementedError(
@@ -65,13 +52,6 @@ class RenderableMixin:
renderer = renderer or self.renderer
template = template_name or self.template_name
context = context or self.get_context()
if (
template == "django/forms/default.html"
or template == "django/forms/formsets/default.html"
):
warnings.warn(
DEFAULT_TEMPLATE_DEPRECATION_MSG, RemovedInDjango50Warning, stacklevel=2
)
return mark_safe(renderer.render(template, context))
__str__ = render