Default API_URL to SITE_URL if missing

Otherwise file uploads and other calls where broken when using CKAN in a non-root location.
ckan · Oct 29, 2013 · 500733e · 500733e
1 parent e4fc2fa
commit 500733e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ckan/public/base/javascript/client.js b/ckan/public/base/javascript/client.js
@@ -370,7 +370,7 @@
   });
 
   ckan.sandbox.setup(function (instance) {
-    instance.client = new Client({endpoint: ckan.API_ROOT});
+    instance.client = new Client({endpoint: ckan.SITE_ROOT});
   });
 
   ckan.Client = Client;

diff --git a/ckan/public/base/javascript/main.js b/ckan/public/base/javascript/main.js
@@ -29,7 +29,9 @@ this.ckan = this.ckan || {};
 
     ckan.SITE_ROOT   = getRootFromData('siteRoot');
     ckan.LOCALE_ROOT = getRootFromData('localeRoot');
-    ckan.API_ROOT    = getRootFromData('apiRoot');
+
+    // Not used, kept for backwards compatibility
+    ckan.API_ROOT    = body.data('apiRoot') || ckan.SITE_ROOT;
 
     // Load the localisations before instantiating the modules.
     ckan.sandbox().client.getLocaleData(locale).done(function (data) {