diff --git a/public/admin/js/custom-fields/custom_fields.js b/public/admin/js/custom-fields/custom_fields.js
index 2364678905cda824b44508b37d7e2b7dbb376f7d..9062c09c75e9fcbc6b72778e10a20849289d4126 100644
--- a/public/admin/js/custom-fields/custom_fields.js
+++ b/public/admin/js/custom-fields/custom_fields.js
@@ -19,12 +19,10 @@
  */
 (function ( $ ) {
   $.fn.report_helper = function() {
-    var bokeh = window.location.pathname.split('/')[1];
-    var base_url = window.location.hostname+'/'+bokeh;
     var current = this;
     return {
       'current': current,
-      'base_url': base_url,
+      'baseUrl': baseUrl,
 
       downloadReport: function(datas) {
 	var a = $('<a target="_blank" download="report.csv" href="data:attachment/csv,' + encodeURIComponent(datas) + '"></a>');
@@ -47,17 +45,17 @@
 
 
       datasFields: function(model) {
-	return this.jsonContent(base_url+'/opac/datas/fields/model/'+model);
+	return this.jsonContent(baseUrl+'/opac/datas/fields/model/'+model);
       },
 
       
       fieldValues: function(model) {
-	return this.jsonContent(base_url+'/opac/datas/values/field/'+model);
+	return this.jsonContent(baseUrl+'/opac/datas/values/field/'+model);
       },
 
       
       numberOf: function(model, id, child_name) {
-	return this.jsonContent(base_url+'/opac/datas/numberof/model/'+model+'/id/'+id+'/children/'+child_name);
+	return this.jsonContent(baseUrl+'/opac/datas/numberof/model/'+model+'/id/'+id+'/children/'+child_name);
       }
 
     };
diff --git a/public/admin/js/custom-fields/tests/custom_fields_test.js b/public/admin/js/custom-fields/tests/custom_fields_test.js
index bdb02b9cc4355e8287a3f74b5c54463d0e3e88eb..9c9636d33771f80df948bcb44502152136365ce9 100644
--- a/public/admin/js/custom-fields/tests/custom_fields_test.js
+++ b/public/admin/js/custom-fields/tests/custom_fields_test.js
@@ -21,18 +21,10 @@
 var fixture = '';
 var helper = null;
 var options = null;
-var bokeh;
-var base_url;
-
-
+var baseUrl = 'bokeh'
 
 QUnit.module('custom_fields', {
   setup: function() {
-
-    bokeh = window.location.pathname.split('/')[1];
-    base_url = window.location.hostname+'/'+bokeh;
-
-
     jQuery.ajax = function (param) {
       options = param;
       var responseText = function() {
@@ -64,17 +56,17 @@ test('link to download csv should be present', function() {
 
 test('url for data model should be as expected' ,function() {
   var fields = helper.datasFields('Article');
-  equal(options.url, base_url+'/opac/datas/fields/model/Article');  
+  equal(options.url, baseUrl+'/opac/datas/fields/model/Article');  
 });
 
 
 test('url for field values should be as expected' ,function() {
   var values = helper.fieldValues(456);
-  equal(options.url, base_url+'/opac/datas/values/field/456');  
+  equal(options.url, baseUrl+'/opac/datas/values/field/456');  
 });
 
 
 test('url for number of children by model and id should be  as expected' ,function() {
   var values = helper.numberOf('Formation',98,'Session');
-  equal(options.url, base_url+'/opac/datas/numberof/model/Formation/id/98/children/Session', options.url);
+  equal(options.url, baseUrl+'/opac/datas/numberof/model/Formation/id/98/children/Session', options.url);
 });