[#1401,templates][xs]: set js global CKAN.SITE_URL with h.url('/') ra…

…ther than g.site_url.
ckan · Jan 31, 2012 · 5f120a8 · 5f120a8
1 parent 42e8efc
commit 5f120a8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ckan/templates/layout_base.html b/ckan/templates/layout_base.html
@@ -243,7 +243,9 @@ <h3 class="widget-title">Meta</h3>
       // Declare js array from Python string
       ${['\'%s\', '%s  for s in config.get('ckan.plugins','').split(' ')]}
     ];
-    CKAN.SITE_URL = '${g.site_url}';
+    CKAN.SITE_URL = '${h.url('/')}';
+    // later use will add offsets with leading '/' so ensure no trailing slash
+    CKAN.SITE_URL = CKAN.SITE_URL.replace(/\/$/, '');
     $(document).ready(function() {
         var ckan_user = $.cookie("ckan_display_name");
         if (ckan_user) {