Support UUID with URL special characters / Fix advanced view.

geonetwork · Jun 11, 2021 · a936d44 · a936d44
1 parent d1fe50d
commit a936d44
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/web-ui/src/main/resources/catalog/components/search/mdview/mdviewModule.js b/web-ui/src/main/resources/catalog/components/search/mdview/mdviewModule.js
@@ -183,8 +183,9 @@
           var f = gnSearchLocation.getFormatterPath();
           $scope.currentFormatter = '';
           if (f != undefined) {
+            var uuid = gnSearchLocation.getUuid();
             $scope.currentFormatter = f.replace(/.*(\/formatters.*)/, '$1');
-            $scope.loadFormatter(f);
+            $scope.loadFormatter(f.replace(uuid, encodeURIComponent(uuid)));
           }
         }
       }

diff --git a/web-ui/src/main/resources/catalog/components/search/mdview/mdviewService.js b/web-ui/src/main/resources/catalog/components/search/mdview/mdviewService.js
@@ -89,7 +89,7 @@
         gnMdViewObj.previousRecords.push(md);
 
         if (!gnMdViewObj.usingFormatter) {
-          $http.post('../api/records/' + md.uuid + '/popularity');
+          $http.post('../api/records/' + encodeURIComponent(md.uuid) + '/popularity');
         }
         this.setLocationUuid(md.uuid, formatter);
         gnMdViewObj.recordsLoaded = true;

diff --git a/web-ui/src/main/resources/catalog/components/search/searchmanager/LocationService.js b/web-ui/src/main/resources/catalog/components/search/searchmanager/LocationService.js
@@ -85,16 +85,16 @@
             $location.path() == '';
       };
       this.getFormatter = function() {
-        var tokens = $location.path().split('/');
-        if (tokens.length > 2 && tokens[3] === 'formatters') {
-          return '/formatters/' + $location.url().split('/formatters/')[1];
+        var tokens = $location.path().split('/formatters/');
+        if (tokens.length === 2) {
+          return '/formatters/' + tokens[1];
         } else {
           return undefined;
         }
       };
       this.getFormatterPath = function() {
-        var tokens = $location.path().split('/');
-        if (tokens.length > 2 && tokens[3] === 'formatters') {
+        var tokens = $location.path().split('/formatters/');
+        if (tokens.length === 2) {
           return '../api/records/' + $location.url().split(/^metadraf|metadata\//)[1];
         } else {
           return undefined;