From 4249a31e3177a7db8385d7ab70d1afbe4f71de10 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Thu, 24 Jul 2014 18:21:24 +0200
Subject: [PATCH] dev #15356 fix use of base url in js
---
public/admin/js/custom-fields/custom_fields.js | 10 ++++------
.../js/custom-fields/tests/custom_fields_test.js | 16 ++++------------
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/public/admin/js/custom-fields/custom_fields.js b/public/admin/js/custom-fields/custom_fields.js
index 2364678905c..9062c09c75e 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 bdb02b9cc43..9c9636d3377 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);
});
--
GitLab