mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add missing block.super in extra_css/extra_js blocks (#7310)

pull/7316/head
Andrew Stone 2021-07-02 12:59:17 -07:00 zatwierdzone przez Matt Westcott
rodzic 9850ca7acf
commit d6c92f30af
10 zmienionych plików z 15 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
CHANGELOG.txt
Wyświetl plik

@ -27,6 +27,7 @@ Changelog
* Fix: Ensure HTML title is populated on project template 404 page (Matt Westcott) * Fix: Ensure HTML title is populated on project template 404 page (Matt Westcott)
* Fix: Respect cache_age parameters on embeds (Gordon Pendleton) * Fix: Respect cache_age parameters on embeds (Gordon Pendleton)
* Fix: Page comparison view now reflects request-level customisations to edit handlers (Matt Westcott) * Fix: Page comparison view now reflects request-level customisations to edit handlers (Matt Westcott)
* Fix: Add `block.super` to remaining `extra_js` & `extra_css` blocks (Andrew Stone)
2.13.3 (05.07.2021) 2.13.3 (05.07.2021)

1
CONTRIBUTORS.rst
Wyświetl plik

@ -520,6 +520,7 @@ Contributors
* Godswill Melford * Godswill Melford
* Jake Howard * Jake Howard
* Petr Dlouhý * Petr Dlouhý
* Andrew Stone
Translators Translators
=========== ===========

1
docs/releases/2.14.rst
Wyświetl plik

@ -38,6 +38,7 @@ Bug fixes
* Ensure HTML title is populated on project template 404 page (Matt Westcott) * Ensure HTML title is populated on project template 404 page (Matt Westcott)
* Respect cache_age parameters on embeds (Gordon Pendleton) * Respect cache_age parameters on embeds (Gordon Pendleton)
* Page comparison view now reflects request-level customisations to edit handlers (Matt Westcott) * Page comparison view now reflects request-level customisations to edit handlers (Matt Westcott)
* Add ``block.super`` to remaining ``extra_js`` & ``extra_css`` blocks (Andrew Stone)
Upgrade considerations Upgrade considerations
====================== ======================

1
wagtail/admin/templates/wagtailadmin/account/account.html
Wyświetl plik

@ -64,6 +64,7 @@
{% endblock %} {% endblock %}
{% block extra_css %} {% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %} {% include "wagtailadmin/pages/_editor_css.html" %}
<link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/account.css' %}" type="text/css" /> <link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/account.css' %}" type="text/css" />
{{ media.css }} {{ media.css }}

1
wagtail/admin/templates/wagtailadmin/home.html
Wyświetl plik

@ -33,6 +33,7 @@
{% endblock %} {% endblock %}
{% block extra_js %} {% block extra_js %}
{{ block.super }}
<script> <script>
$(function() { $(function() {
$('.object.collapsible').each(function() { $('.object.collapsible').each(function() {

2
wagtail/admin/templates/wagtailadmin/reports/base_report.html
Wyświetl plik

@ -56,11 +56,13 @@
{% endblock %} {% endblock %}
{% block extra_css %} {% block extra_css %}
{{ block.super }}
<link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/report.css' %}" type="text/css" /> <link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/report.css' %}" type="text/css" />
{{ filters.form.media.css }} {{ filters.form.media.css }}
{% endblock %} {% endblock %}
{% block extra_js %} {% block extra_js %}
{{ block.super }}
{{ filters.form.media.js }} {{ filters.form.media.js }}
{% endblock %} {% endblock %}

2
wagtail/admin/templates/wagtailadmin/workflows/create.html
Wyświetl plik

@ -4,6 +4,7 @@
{% block titletag %}{{ view.page_title }}{% endblock %} {% block titletag %}{{ view.page_title }}{% endblock %}
{% block extra_css %} {% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %} {% include "wagtailadmin/pages/_editor_css.html" %}
<link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/workflow-edit.css' %}" type="text/css" /> <link rel="stylesheet" href="{% versioned_static 'wagtailadmin/css/layouts/workflow-edit.css' %}" type="text/css" />
{{ edit_handler.form.media.css }} {{ edit_handler.form.media.css }}
@ -13,6 +14,7 @@
{% endblock %} {% endblock %}
{% block extra_js %} {% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %} {% include "wagtailadmin/pages/_editor_js.html" %}
{{ edit_handler.form.media.js }} {{ edit_handler.form.media.js }}
{{ pages_formset.media.js }} {{ pages_formset.media.js }}

2
wagtail/admin/templates/wagtailadmin/workflows/create_task.html
Wyświetl plik

@ -4,6 +4,7 @@
{% block titletag %}{{ view.page_title }}{% endblock %} {% block titletag %}{{ view.page_title }}{% endblock %}
{% block extra_css %} {% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %} {% include "wagtailadmin/pages/_editor_css.html" %}
{{ edit_handler.form.media.css }} {{ edit_handler.form.media.css }}
@ -11,6 +12,7 @@
{% endblock %} {% endblock %}
{% block extra_js %} {% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %} {% include "wagtailadmin/pages/_editor_js.html" %}
{{ edit_handler.form.media.js }} {{ edit_handler.form.media.js }}
{{ edit_handler.html_declarations }} {{ edit_handler.html_declarations }}

2
wagtail/admin/templates/wagtailadmin/workflows/edit.html
Wyświetl plik

@ -4,6 +4,7 @@
{% block titletag %}{{ view.page_title }}{% endblock %} {% block titletag %}{{ view.page_title }}{% endblock %}
{% block extra_css %} {% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %} {% include "wagtailadmin/pages/_editor_css.html" %}
{{ edit_handler.form.media.css }} {{ edit_handler.form.media.css }}
{{ pages_formset.media.css }} {{ pages_formset.media.css }}
@ -13,6 +14,7 @@
{% endblock %} {% endblock %}
{% block extra_js %} {% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %} {% include "wagtailadmin/pages/_editor_js.html" %}
{{ edit_handler.form.media.js }} {{ edit_handler.form.media.js }}
{{ pages_formset.media.js }} {{ pages_formset.media.js }}

2
wagtail/admin/templates/wagtailadmin/workflows/edit_task.html
Wyświetl plik

@ -4,6 +4,7 @@
{% block titletag %}{{ view.page_title }}{% endblock %} {% block titletag %}{{ view.page_title }}{% endblock %}
{% block extra_css %} {% block extra_css %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_css.html" %} {% include "wagtailadmin/pages/_editor_css.html" %}
{{ edit_handler.form.media.css }} {{ edit_handler.form.media.css }}
@ -11,6 +12,7 @@
{% endblock %} {% endblock %}
{% block extra_js %} {% block extra_js %}
{{ block.super }}
{% include "wagtailadmin/pages/_editor_js.html" %} {% include "wagtailadmin/pages/_editor_js.html" %}
{{ edit_handler.form.media.js }} {{ edit_handler.form.media.js }}
{{ edit_handler.html_declarations }} {{ edit_handler.html_declarations }}