From 5aa8e00d77d20060f75b7ca65e28ef502c54245c Mon Sep 17 00:00:00 2001 From: "LB (Ben Johnston)" Date: Tue, 14 Feb 2017 12:51:29 +0700 Subject: [PATCH] fix location of {{ block.super }} Fix: extra_js in snippets type_index `{{ block.super }}` should be outside script tags. All other locations of block.super are outside of script tags --- CHANGELOG.txt | 1 + CONTRIBUTORS.rst | 1 + docs/releases/1.10.rst | 1 + .../templates/wagtailsnippets/snippets/type_index.html | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index dc8f886aeb..95980bcd19 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -9,6 +9,7 @@ Changelog * Added a `submit_buttons` block to login template (Gagaro) * Fix: Marked 'Date from' / 'Date to' strings in wagtailforms for translation (Vorlif) * Fix: Unreliable preview is now reliable by always opening in a new window (Kjartan Sverrisson) + * Fix: Fixed placement of `{{ block.super }}` in `snippets/type_index.html` (LB (Ben Johnston)) 1.9 (xx.xx.xxxx) - IN DEVELOPMENT diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index d4392d2107..2d322fffe0 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -212,6 +212,7 @@ Contributors * Alasdair Nicol * Vorlif * Kjartan Sverrisson +* LB (Ben Johnston) Translators =========== diff --git a/docs/releases/1.10.rst b/docs/releases/1.10.rst index e33c5c4d18..23fd68deec 100644 --- a/docs/releases/1.10.rst +++ b/docs/releases/1.10.rst @@ -23,6 +23,7 @@ Bug fixes * Marked 'Date from' / 'Date to' strings in wagtailforms for translation (Vorlif) * Unreliable preview is now reliable by always opening in a new window (Kjartan Sverrisson) + * Fixed placement of ``{{ block.super }}`` in ``snippets/type_index.html`` (LB (Ben Johnston)) Upgrade considerations diff --git a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html index f4e34a4df5..e67cc16c79 100644 --- a/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html +++ b/wagtail/wagtailsnippets/templates/wagtailsnippets/snippets/type_index.html @@ -3,8 +3,8 @@ {% block titletag %}{% blocktrans with snippet_type_name_plural=model_opts.verbose_name_plural|capfirst %}Snippets {{ snippet_type_name_plural }}{% endblocktrans %}{% endblock %} {% block extra_js %} + {{ block.super }}