Object tools moved out of content block breaks custom admin templates

[Fabian Braun]

In Django 5.2 the admin's object-tools block has been moved outside of the content block in django/contrib/admin/templates/admin/base.html as part of ​https://github.com/django/django/pull/19032 fixing a layout issue.

Before Django 5.2:

    ...
    {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
    {% block content_subtitle %}{% if subtitle %}<h2>{{ subtitle }}</h2>{% endif %}{% endblock %}
    {% block content %}
        {% block object-tools %}{% endblock %}
        {{ content }}
    {% endblock %}
    ...

Since Django 5.2:

    ...
    {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
    {% block object-tools %}{% endblock %}
    {% block content_subtitle %}{% if subtitle %}<h2>{{ subtitle }}</h2>{% endif %}{% endblock %}
    {% block content %}
        {{ content }}
    {% endblock %}
    ...

This is a breaking change in commit abe925ff0bec2db8cd6247397327889d5f1a7f7c:

• Templates that overwrite the content block and contain an object-tools block will have the object tools rendered twice (for example: django-filer)
• Templates that overwrite the content block and do not contain an object-tools block will have the default object-tools block rendered instead of none. This can lead to exceptions and server errors 500.

The change is not documented, nor am I aware that it is intended.

[Sarah Boyce]

Thank you for the report!
I agree this is not intended, at the very least we would need a note in the breaking changes of 5.2.

Regression in b1324a680add78de24c763911d0eefa19b9263bc (refs #36055).
One option is to revert b1324a680add78de24c763911d0eefa19b9263bc and 02a5cbfe76382da2a0414df17017185be5bd47f9 which I'm open to (then re-open #36055).
Antoliny can you take a look?

[Antoliny]

Replying to Sarah Boyce:

Thank you for the report!
I agree this is not intended, at the very least we would need a note in the breaking changes of 5.2.

Regression in b1324a680add78de24c763911d0eefa19b9263bc (refs #36055).
One option is to revert b1324a680add78de24c763911d0eefa19b9263bc and 02a5cbfe76382da2a0414df17017185be5bd47f9 which I'm open to (then re-open #36055).
Antoliny can you take a look?

Sure sarahboyce! I'll take a look. and thank you Fabian Braun :)

[Antoliny]

​PR

[nessita <124304+nessita@…>]

In 1bc805e:

Fixed #36331 -- Reverted "Fixed #36055 -- Prevented overlap of object-tools buttons and page header in the admin."

This reverts commits b1324a680add78de24c763911d0eefa19b9263bc and
02a5cbfe76382da2a0414df17017185be5bd47f9. The former caused a regression
in admin sites that relied on the object-tools block being inside the
content block.

Thank you to Fabian Braun for the report.

[Natalia <124304+nessita@…>]

In 97c9354:

[5.2.x] Fixed #36331 -- Reverted "Fixed #36055 -- Prevented overlap of object-tools buttons and page header in the admin."

This reverts commits b1324a680add78de24c763911d0eefa19b9263bc and
02a5cbfe76382da2a0414df17017185be5bd47f9. The former caused a regression
in admin sites that relied on the object-tools block being inside the
content block.

Thank you to Fabian Braun for the report.

Backport of 1bc805e23b73a580b82a1d416ab0fb59a1073047 from main.