From 3b72a65f99fabf41318bfd62b0176f93104ee07a Mon Sep 17 00:00:00 2001 From: Jason Boyer Date: Wed, 8 Jan 2020 13:37:01 -0500 Subject: [PATCH] LP1858701: prevent doubles slashes in opac iframe urls The CGI module (used by mkurl()) does not like it if we have two slashes in a URL sort/of/like//this. Things work but the path portion of the URL is doubled each time mkurl is used on it. This branch fixes 2 causes in the staff OPAC. Signed-off-by: Jason Boyer Signed-off-by: Rogan Hamby Signed-off-by: Jane Sandberg --- Open-ILS/web/js/ui/default/staff/cat/catalog/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js index 68f387e6e0..c3b6b1f6bf 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js @@ -1944,13 +1944,13 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e // A record ID in the path indicates a request for the record- // specific page. if ($routeParams.record_id) { - url = url.replace(/advanced/, '/record/' + $scope.record_id); + url = url.replace(/\/advanced/, '/record/' + $scope.record_id); } // Jumping directly to the results page by passing a search // query via the URL. Copy all URL params to the iframe url. if ($location.path().match(/catalog\/results/)) { - url = url.replace(/advanced/, '/results?'); + url = url.replace(/\/advanced/, '/results?'); var first = true; angular.forEach($location.search(), function(val, key) { if (!first) url += '&'; -- 2.11.0