diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee index 7f5705065..84c012318 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee @@ -41,9 +41,9 @@ if lastSelection.collapsed # TODO: don't hard-code this, as it may be changed in urls.py - url = '/admin/choose-page/?allow_external_link=true&allow_email_link=true&prompt_for_link_text=true' + url = window.page_chooser+'?allow_external_link=true&allow_email_link=true&prompt_for_link_text=true' else - url = '/admin/choose-page/?allow_external_link=true&allow_email_link=true' + url = window.page_chooser+'?allow_external_link=true&allow_email_link=true' ModalWorkflow url: url diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/page-chooser.js b/wagtail/wagtailadmin/static/wagtailadmin/js/page-chooser.js index 337fc30be..5033a3866 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/js/page-chooser.js +++ b/wagtail/wagtailadmin/static/wagtailadmin/js/page-chooser.js @@ -4,8 +4,7 @@ function createPageChooser(id, pageType, openAtParentId) { var input = $('#' + id); $('.action-choose', chooserElement).click(function() { - var initialUrl = '/admin/choose-page/'; - /* TODO: don't hard-code this URL, as it may be changed in urls.py */ + var initialUrl = window.page_chooser; if (openAtParentId) { initialUrl += openAtParentId + '/'; } diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html index 1a61a5a2e..ce63d400f 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_editor_js.html @@ -29,6 +29,13 @@ + {% endcompress %}