Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-10 01:50:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove duplicate definition of form media in settings - fixes #2664

Browse source 
Form media declarations are output in edit.html, but this is redundant as they're already output in _editor_css.html / _editor_js.html,
and the duplicate definitions cause the rich text editor to fail to activate for some reason.
This commit is contained in:
Matt Westcott 2016-06-03 15:09:20 +01:00 committed by Mikalai Radchuk
parent 892c4c77d6
commit 8d1c8193fa
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -14,6 +14,7 @@ Changelog
* Fix: When editing a document link in rich text, the document ID is no longer erroneously interpreted as a page ID (Stephen Rice)
* Fix: Removing embedded media from rich text by mouse click action now gets correctly registered as a change to the field (Loic Teixeira)
* Fix: Rich text editor is no longer broken in InlinePanels (Matt Westcott, Yann Fouillat)
* Fix: Rich text editor is no longer broken in settings (Matt Westcott)
1.5 (31.05.2016)

1
docs/releases/1.5.1.rst
View file

@ -17,3 +17,4 @@ Bug fixes
* When editing a document link in rich text, the document ID is no longer erroneously interpreted as a page ID (Stephen Rice)
* Removing embedded media from rich text by mouse click action now gets correctly registered as a change to the field (Loic Teixeira)
* Rich text editor is no longer broken in InlinePanels (Matt Westcott, Yann Fouillat)
* Rich text editor is no longer broken in settings (Matt Westcott)

2
wagtail/contrib/settings/templates/wagtailsettings/edit.html
View file

@ -43,11 +43,9 @@
{% block extra_css %}
{% include "wagtailadmin/pages/_editor_css.html" %}
{{ form.media.css }}
{{ site_switcher.media.css }}
{% endblock %}
{% block extra_js %}
{% include "wagtailadmin/pages/_editor_js.html" %}
{{ form.media.js }}
{{ site_switcher.media.js }}
{% endblock %}