From 70242efa2c5aca879e21a0cd4bfb6456d0d7617d Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 30 Sep 2020 18:10:47 +0100
Subject: [PATCH] Pass task chooser URL via data attribute instead of
 chooserUrls

---
 wagtail/admin/static_src/wagtailadmin/js/task-chooser.js        | 2 +-
 wagtail/admin/templates/wagtailadmin/pages/_editor_js.html      | 1 -
 .../templates/wagtailadmin/workflows/widgets/task_chooser.html  | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wagtail/admin/static_src/wagtailadmin/js/task-chooser.js b/wagtail/admin/static_src/wagtailadmin/js/task-chooser.js
index c1eba465dd..fe624c5cef 100644
--- a/wagtail/admin/static_src/wagtailadmin/js/task-chooser.js
+++ b/wagtail/admin/static_src/wagtailadmin/js/task-chooser.js
@@ -6,7 +6,7 @@ function createTaskChooser(id) {
 
     $('.action-choose', chooserElement).on('click', function() {
         ModalWorkflow({
-            url: window.chooserUrls.taskChooser,
+            url: chooserElement.data('chooserUrl'),
             onload: TASK_CHOOSER_MODAL_ONLOAD_HANDLERS,
             responses: {
                 taskChosen: function(data) {
diff --git a/wagtail/admin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/admin/templates/wagtailadmin/pages/_editor_js.html
index f68b65d837..def4a1ec34 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/_editor_js.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/_editor_js.html
@@ -12,7 +12,6 @@
         'emailLinkChooser': '{% url "wagtailadmin_choose_page_email_link" %}',
         'phoneLinkChooser': '{% url "wagtailadmin_choose_page_phone_link" %}',
         'anchorLinkChooser': '{% url "wagtailadmin_choose_page_anchor_link" %}',
-        'taskChooser': '{% url "wagtailadmin_workflows:task_chooser" %}',
     };
     window.unicodeSlugsEnabled = {% if unicode_slugs_enabled %}true{% else %}false{% endif %};
 </script>
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/widgets/task_chooser.html b/wagtail/admin/templates/wagtailadmin/workflows/widgets/task_chooser.html
index 67e2ecd71b..8023b0052d 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/widgets/task_chooser.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/widgets/task_chooser.html
@@ -1,5 +1,6 @@
 {% extends "wagtailadmin/widgets/chooser.html" %}
 {% block chooser_class %}task-chooser{% endblock %}
+{% block chooser_attributes %}data-chooser-url="{% url "wagtailadmin_workflows:task_chooser" %}"{% endblock %}
 
 {% block chosen_state_view %}
     <span class="name">{{ task.name }}</span>