[open-ils-commits] [GIT] Evergreen ILS branch rel_3_5 updated. b584ea2a39d6f7a26e40f87dde09327857185e3f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_5 has been updated
       via  b584ea2a39d6f7a26e40f87dde09327857185e3f (commit)
      from  d920660f94700d2c06d3296182b2e81fba81f334 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b584ea2a39d6f7a26e40f87dde09327857185e3f
Author: Jason Boyer <JBoyer at eoli.info>
Date:   Wed Jan 8 13:37:01 2020 -0500

    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 <JBoyer at eoli.info>
    Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>

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 += '&';

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/ui/default/staff/cat/catalog/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS