diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 07a44677d8..06cb1e44e0 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,7 +19,8 @@ Changelog 1.12.2 (xx.xx.xxxx) - IN DEVELOPMENT ~~~~~~~~~~~~~~~~~~~ - * Fix: Migration for addition of ``Page.draft_title`` field is now reversible (Venelin Stoykov) + * Fix: Migration for addition of `Page.draft_title` field is now reversible (Venelin Stoykov) + * Fix: Fixed failure on application startup when `ManifestStaticFilesStorage` is in use and `collectstatic` has not yet been run (Matt Westcott) 1.12.1 (30.08.2017) diff --git a/docs/advanced_topics/customisation/page_editing_interface.rst b/docs/advanced_topics/customisation/page_editing_interface.rst index ba5d999429..6207210087 100644 --- a/docs/advanced_topics/customisation/page_editing_interface.rst +++ b/docs/advanced_topics/customisation/page_editing_interface.rst @@ -105,7 +105,7 @@ Once the plugin has been created, it should be registered as a rich text feature 'hallo', 'blockquote', HalloPlugin( name='halloblockquote', - js=[static('myapp/js/hallo-blockquote.js')], + js=['myapp/js/hallo-blockquote.js'], ) ) diff --git a/docs/releases/1.12.2.rst b/docs/releases/1.12.2.rst index b4188f64c2..d8d1b4d0d8 100644 --- a/docs/releases/1.12.2.rst +++ b/docs/releases/1.12.2.rst @@ -14,3 +14,4 @@ Bug fixes ~~~~~~~~~ * Migration for addition of ``Page.draft_title`` field is now reversible (Venelin Stoykov) + * Fixed failure on application startup when ``ManifestStaticFilesStorage`` is in use and ``collectstatic`` has not yet been run (Matt Westcott) diff --git a/wagtail/tests/testapp/wagtail_hooks.py b/wagtail/tests/testapp/wagtail_hooks.py index 6f71b2e8c6..19639e1c76 100644 --- a/wagtail/tests/testapp/wagtail_hooks.py +++ b/wagtail/tests/testapp/wagtail_hooks.py @@ -99,7 +99,7 @@ def register_blockquote_feature(features): features.register_editor_plugin( 'hallo', 'blockquote', HalloPlugin( name='halloblockquote', - js=[static('testapp/js/hallo-blockquote.js')], - css={'all': [static('testapp/css/hallo-blockquote.css')]}, + js=['testapp/js/hallo-blockquote.js'], + css={'all': ['testapp/css/hallo-blockquote.css']}, ) ) diff --git a/wagtail/wagtailadmin/rich_text.py b/wagtail/wagtailadmin/rich_text.py index 5a5f7642c3..c7bbfec105 100644 --- a/wagtail/wagtailadmin/rich_text.py +++ b/wagtail/wagtailadmin/rich_text.py @@ -4,7 +4,6 @@ import json from collections import OrderedDict from django.conf import settings -from django.contrib.staticfiles.templatetags.staticfiles import static from django.forms import Media, widgets from django.utils.module_loading import import_string @@ -74,7 +73,7 @@ class HalloListPlugin(HalloPlugin): CORE_HALLO_PLUGINS = [ HalloPlugin(name='halloreundo', order=50), HalloPlugin(name='hallorequireparagraphs', js=[ - static('wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js'), + 'wagtailadmin/js/hallo-plugins/hallo-requireparagraphs.js', ]), HalloHeadingPlugin(element='p') ] @@ -143,8 +142,8 @@ class HalloRichTextArea(WidgetWithScript, widgets.Textarea): @property def media(self): media = Media(js=[ - static('wagtailadmin/js/vendor/hallo.js'), - static('wagtailadmin/js/hallo-bootstrap.js'), + 'wagtailadmin/js/vendor/hallo.js', + 'wagtailadmin/js/hallo-bootstrap.js', ]) for plugin in self.plugins: diff --git a/wagtail/wagtailadmin/wagtail_hooks.py b/wagtail/wagtailadmin/wagtail_hooks.py index 0526cb9583..2c05b9dca7 100644 --- a/wagtail/wagtailadmin/wagtail_hooks.py +++ b/wagtail/wagtailadmin/wagtail_hooks.py @@ -1,7 +1,6 @@ from __future__ import absolute_import, unicode_literals from django.contrib.auth.models import Permission -from django.contrib.staticfiles.templatetags.staticfiles import static from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _ @@ -189,7 +188,7 @@ def register_core_features(features): 'hallo', 'hr', HalloPlugin( name='hallohr', - js=[static('wagtailadmin/js/hallo-plugins/hallo-hr.js')], + js=['wagtailadmin/js/hallo-plugins/hallo-hr.js'], order=45, ) ) @@ -199,7 +198,7 @@ def register_core_features(features): 'hallo', 'link', HalloPlugin( name='hallowagtaillink', - js=[static('wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js')], + js=['wagtailadmin/js/hallo-plugins/hallo-wagtaillink.js'], ) ) features.default_features.append('link') diff --git a/wagtail/wagtaildocs/wagtail_hooks.py b/wagtail/wagtaildocs/wagtail_hooks.py index 0ac98ee0f3..c84be4ca28 100644 --- a/wagtail/wagtaildocs/wagtail_hooks.py +++ b/wagtail/wagtaildocs/wagtail_hooks.py @@ -80,7 +80,7 @@ def register_embed_feature(features): 'hallo', 'document-link', HalloPlugin( name='hallowagtaildoclink', - js=[static('wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js')], + js=['wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js'], ) ) features.default_features.append('document-link') diff --git a/wagtail/wagtailembeds/wagtail_hooks.py b/wagtail/wagtailembeds/wagtail_hooks.py index 87d447830b..2e37d26655 100644 --- a/wagtail/wagtailembeds/wagtail_hooks.py +++ b/wagtail/wagtailembeds/wagtail_hooks.py @@ -1,7 +1,6 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import include, url -from django.contrib.staticfiles.templatetags.staticfiles import static from django.core import urlresolvers from django.utils.html import format_html @@ -37,7 +36,7 @@ def register_embed_feature(features): 'hallo', 'embed', HalloPlugin( name='hallowagtailembeds', - js=[static('wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.js')], + js=['wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.js'], ) ) features.default_features.append('embed') diff --git a/wagtail/wagtailimages/wagtail_hooks.py b/wagtail/wagtailimages/wagtail_hooks.py index b4902b83fc..2edacfe9c3 100644 --- a/wagtail/wagtailimages/wagtail_hooks.py +++ b/wagtail/wagtailimages/wagtail_hooks.py @@ -72,7 +72,7 @@ def register_image_feature(features): 'hallo', 'image', HalloPlugin( name='hallowagtailimage', - js=[static('wagtailimages/js/hallo-plugins/hallo-wagtailimage.js')], + js=['wagtailimages/js/hallo-plugins/hallo-wagtailimage.js'], ) ) features.default_features.append('image')