diff --git a/client/tests/stubs.js b/client/tests/stubs.js index 99fa95ea3c..1afbccbac9 100644 --- a/client/tests/stubs.js +++ b/client/tests/stubs.js @@ -61,7 +61,6 @@ global.chooserUrls = { externalLinkChooser: '/admin/choose-external-link/', imageChooser: '/admin/images/chooser/', pageChooser: '/admin/choose-page/', - snippetChooser: '/admin/snippets/choose/', }; /* use dummy content for onload handlers just so that we can verify that we've chosen the right one */ diff --git a/wagtail/admin/templates/wagtailadmin/widgets/chooser.html b/wagtail/admin/templates/wagtailadmin/widgets/chooser.html index a36676eba7..b2ca44f8ad 100644 --- a/wagtail/admin/templates/wagtailadmin/widgets/chooser.html +++ b/wagtail/admin/templates/wagtailadmin/widgets/chooser.html @@ -6,7 +6,7 @@ when clicked. {% endcomment %} -
+
{% block chosen_state_view %}{% endblock %} diff --git a/wagtail/snippets/static_src/wagtailsnippets/js/snippet-chooser.js b/wagtail/snippets/static_src/wagtailsnippets/js/snippet-chooser.js index 81602282d4..1aaeea2ef2 100644 --- a/wagtail/snippets/static_src/wagtailsnippets/js/snippet-chooser.js +++ b/wagtail/snippets/static_src/wagtailsnippets/js/snippet-chooser.js @@ -6,7 +6,7 @@ function createSnippetChooser(id, modelString) { $('.action-choose', chooserElement).on('click', function() { ModalWorkflow({ - url: window.chooserUrls.snippetChooser + modelString + '/', + url: chooserElement.data('chooserUrl') + modelString + '/', onload: SNIPPET_CHOOSER_MODAL_ONLOAD_HANDLERS, responses: { snippetChosen: function(snippetData) { diff --git a/wagtail/snippets/templates/wagtailsnippets/widgets/snippet_chooser.html b/wagtail/snippets/templates/wagtailsnippets/widgets/snippet_chooser.html index 285b25842d..cdac32e208 100644 --- a/wagtail/snippets/templates/wagtailsnippets/widgets/snippet_chooser.html +++ b/wagtail/snippets/templates/wagtailsnippets/widgets/snippet_chooser.html @@ -2,6 +2,7 @@ {% load wagtailadmin_tags %} {% block chooser_class %}snippet-chooser{% endblock %} +{% block chooser_attributes %}data-chooser-url="{% url 'wagtailsnippets:choose_generic' %}"{% endblock %} {% block chosen_state_view %} {{ item }} diff --git a/wagtail/snippets/wagtail_hooks.py b/wagtail/snippets/wagtail_hooks.py index ce0dee1306..d2ccf18e8e 100644 --- a/wagtail/snippets/wagtail_hooks.py +++ b/wagtail/snippets/wagtail_hooks.py @@ -2,7 +2,6 @@ from django.contrib.admin.utils import quote from django.contrib.auth.models import Permission from django.contrib.contenttypes.models import ContentType from django.urls import include, path, reverse -from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ from wagtail.admin.menu import MenuItem @@ -36,16 +35,6 @@ def register_snippets_menu_item(): ) -@hooks.register('insert_editor_js') -def editor_js(): - return format_html( - """ - - """, - reverse('wagtailsnippets:choose_generic') - ) - - @hooks.register('register_permissions') def register_permissions(): content_types = ContentType.objects.get_for_models(*get_snippet_models()).values()