Merge remote-tracking branch 'origin/develop' into develop

geonetwork · Nov 1, 2013 · 64b05f4 · 64b05f4
2 parents caef949 + ac821be
commit 64b05f4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/web/src/main/webapp/scripts/editor/metadata-editor.js b/web/src/main/webapp/scripts/editor/metadata-editor.js
@@ -1,5 +1,9 @@
 var getGNServiceURL = function(service) {
-	return Env.locService+"/"+service;
+    if (service.indexOf("/") == 0) {
+        return Env.locService+service;
+    } else {
+        return Env.locService+'/'+service;
+    }
 };
 
 function findPos(obj) 

diff --git a/web/src/main/webapp/scripts/editor/metadata-show.js b/web/src/main/webapp/scripts/editor/metadata-show.js
@@ -1,8 +1,12 @@
 // Functions called from the metadata viewer
 
-			var getGNServiceURL = function(service) {
-			  return Env.locService+"/"+service;
-			};
+            var getGNServiceURL = function(service) {
+                if (service.indexOf("/") == 0) {
+                    return Env.locService+service;
+                } else {
+                    return Env.locService+'/'+service;
+                }
+            };
 
 // for processing categories and privileges buttons
 

diff --git a/web/src/main/webapp/scripts/geonetwork.js b/web/src/main/webapp/scripts/geonetwork.js
@@ -1,7 +1,11 @@
 // VARIABLE DECLARATIONS
 
 var getGNServiceURL = function(service) {
-	return Env.locService+"/"+service;
+    if (service.indexOf("/") == 0) {
+        return Env.locService+service;
+    } else {
+        return Env.locService+'/'+service;
+    }
 };
 
 function init() {};