Pass snippet chooser URL via data attribute instead of chooserUrls

pull/6384/head
Matt Westcott 2020-09-30 18:03:46 +01:00 zatwierdzone przez Matt Westcott
rodzic dc110b5432
commit 499193d05c
5 zmienionych plików z 3 dodań i 14 usunięć

Wyświetl plik

@ -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 */

Wyświetl plik

@ -6,7 +6,7 @@
when clicked.
{% endcomment %}
<div id="{{ attrs.id }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not value %}blank{% endif %}">
<div id="{{ attrs.id }}-chooser" class="chooser {% block chooser_class %}page-chooser{% endblock %} {% if not value %}blank{% endif %}" {% block chooser_attributes %}{% endblock %}>
<div class="chosen">
{% block chosen_state_view %}{% endblock %}

Wyświetl plik

@ -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) {

Wyświetl plik

@ -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 %}
<span class="title">{{ item }}</span>

Wyświetl plik

@ -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(
"""
<script>window.chooserUrls.snippetChooser = '{0}';</script>
""",
reverse('wagtailsnippets:choose_generic')
)
@hooks.register('register_permissions')
def register_permissions():
content_types = ContentType.objects.get_for_models(*get_snippet_models()).values()