From b7158bb3fab5ba8923dc4311e4b538e4e21316e9 Mon Sep 17 00:00:00 2001
From: Serafeim Papastefanos <spapas@gmail.com>
Date: Wed, 12 Feb 2014 11:03:47 +0200
Subject: [PATCH] Removes hard coded links to /admin

The _editor_js.html page has been modified in order to get the urls to the
various views through the {% url %} tag and add them to the global window
variable. I believe that this is actually the best solution in our case
and I like it much better than the other available options.
---
 .../wagtailadmin/js/hallo-plugins/hallo-wagtaillink.coffee | 4 ++--
 .../wagtailadmin/static/wagtailadmin/js/page-chooser.js    | 3 +--
 .../templates/wagtailadmin/pages/_editor_js.html           | 7 +++++++
 .../wagtaildocs/static/wagtaildocs/js/document-chooser.js  | 2 +-
 .../js/hallo-plugins/hallo-wagtaildoclink.coffee           | 2 +-
 .../js/hallo-plugins/hallo-wagtailembeds.coffee            | 2 +-
 .../js/hallo-plugins/hallo-wagtailimage.coffee             | 2 +-
 .../wagtailimages/static/wagtailimages/js/image-chooser.js | 2 +-
 .../static/wagtailsnippets/js/snippet-chooser.js           | 2 +-
 wagtail/wagtailsnippets/urls.py                            | 1 +
 10 files changed, 17 insertions(+), 10 deletions(-)

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 @@
     <script src="{{ STATIC_URL }}wagtaildocs/js/document-chooser.js"></script>
     <script src="{{ STATIC_URL }}wagtailsnippets/js/snippet-chooser.js"></script>
     <script src="{{ STATIC_URL }}admin/js/urlify.js"></script>
+    <script type='text/javascript'>
+        window.document_chooser='{% url "wagtaildocs_chooser" %}';
+        window.image_chooser='{% url "wagtailimages_chooser" %}';
+        window.embeds_chooser='{% url "wagtailembeds_chooser" %}';
+        window.page_chooser='{% url "wagtailadmin_choose_page" %}';
+        window.snippet_chooser='{% url "wagtailsnippets_choose_generic" %}';
+    </script>
 {% endcompress %}
 
 <script>
diff --git a/wagtail/wagtaildocs/static/wagtaildocs/js/document-chooser.js b/wagtail/wagtaildocs/static/wagtaildocs/js/document-chooser.js
index 79d6bac5b..7c690ea14 100644
--- a/wagtail/wagtaildocs/static/wagtaildocs/js/document-chooser.js
+++ b/wagtail/wagtaildocs/static/wagtaildocs/js/document-chooser.js
@@ -5,7 +5,7 @@ function createDocumentChooser(id) {
 
     $('.action-choose', chooserElement).click(function() {
         ModalWorkflow({
-            'url': '/admin/documents/chooser/', /* TODO: don't hard-code this, as it may be changed in urls.py */
+            'url': window.document_chooser,
             'responses': {
                 'documentChosen': function(docData) {
                     input.val(docData.id);
diff --git a/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee b/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee
index 180190cbd..d213eeb16 100644
--- a/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee
+++ b/wagtail/wagtaildocs/static/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.coffee
@@ -24,7 +24,7 @@
             button.on "click", (event) ->
                 lastSelection = widget.options.editable.getSelection()
                 ModalWorkflow
-                    url: '/admin/documents/chooser/' # TODO: don't hard-code this, as it may be changed in urls.py
+                    url: window.document_chooser
                     responses:
                         documentChosen: (docData) ->
                             a = document.createElement('a')
diff --git a/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee b/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee
index 9ce0cf58c..7c53ba656 100644
--- a/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee
+++ b/wagtail/wagtailembeds/static/wagtailembeds/js/hallo-plugins/hallo-wagtailembeds.coffee
@@ -25,7 +25,7 @@
                 lastSelection = widget.options.editable.getSelection()
                 insertionPoint = $(lastSelection.endContainer).parentsUntil('.richtext').last()
                 ModalWorkflow
-                    url: '/admin/embeds/chooser/' # TODO: don't hard-code this, as it may be changed in urls.py
+                    url: window.embeds_chooser
                     responses:
                         embedChosen: (embedData) ->
                             elem = $(embedData).get(0)
diff --git a/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee b/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee
index ab5e8a7ed..2e71a03d8 100644
--- a/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee
+++ b/wagtail/wagtailimages/static/wagtailimages/js/hallo-plugins/hallo-wagtailimage.coffee
@@ -25,7 +25,7 @@
                 lastSelection = widget.options.editable.getSelection()
                 insertionPoint = $(lastSelection.endContainer).parentsUntil('.richtext').last()
                 ModalWorkflow
-                    url: '/admin/images/chooser/?select_format=true' # TODO: don't hard-code this, as it may be changed in urls.py
+                    url: window.image_chooser+'?select_format=true'
                     responses:
                         imageChosen: (imageData) ->
                             elem = $(imageData.html).get(0)
diff --git a/wagtail/wagtailimages/static/wagtailimages/js/image-chooser.js b/wagtail/wagtailimages/static/wagtailimages/js/image-chooser.js
index cd340b1ca..1e9904995 100644
--- a/wagtail/wagtailimages/static/wagtailimages/js/image-chooser.js
+++ b/wagtail/wagtailimages/static/wagtailimages/js/image-chooser.js
@@ -5,7 +5,7 @@ function createImageChooser(id) {
 
     $('.action-choose', chooserElement).click(function() {
         ModalWorkflow({
-            'url': '/admin/images/chooser/', /* TODO: don't hard-code this, as it may be changed in urls.py */
+            'url': window.image_chooser,
             'responses': {
                 'imageChosen': function(imageData) {
                     input.val(imageData.id);
diff --git a/wagtail/wagtailsnippets/static/wagtailsnippets/js/snippet-chooser.js b/wagtail/wagtailsnippets/static/wagtailsnippets/js/snippet-chooser.js
index e0172e0d8..664c04608 100644
--- a/wagtail/wagtailsnippets/static/wagtailsnippets/js/snippet-chooser.js
+++ b/wagtail/wagtailsnippets/static/wagtailsnippets/js/snippet-chooser.js
@@ -5,7 +5,7 @@ function createSnippetChooser(id, contentType) {
 
     $('.action-choose', chooserElement).click(function() {
         ModalWorkflow({
-            'url': '/admin/snippets/choose/' + contentType + '/', /* TODO: don't hard-code this, as it may be changed in urls.py */
+            'url': window.snippet_chooser + contentType + '/',  
             'responses': {
                 'snippetChosen': function(snippetData) {
                     input.val(snippetData.id);
diff --git a/wagtail/wagtailsnippets/urls.py b/wagtail/wagtailsnippets/urls.py
index 326834e86..927c30c28 100644
--- a/wagtail/wagtailsnippets/urls.py
+++ b/wagtail/wagtailsnippets/urls.py
@@ -5,6 +5,7 @@ urlpatterns = patterns(
     'wagtail.wagtailsnippets.views',
     url(r'^$', 'snippets.index', name='wagtailsnippets_index'),
 
+    url(r'^choose/$', 'chooser.choose', name='wagtailsnippets_choose_generic'),
     url(r'^choose/(\w+)/(\w+)/$', 'chooser.choose', name='wagtailsnippets_choose'),
     url(r'^choose/(\w+)/(\w+)/(\d+)/$', 'chooser.chosen', name='wagtailsnippets_chosen'),