[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2c49627bb0cf49423fa9c9be4822282674df2039

[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, master has been updated
       via  2c49627bb0cf49423fa9c9be4822282674df2039 (commit)
      from  ecb1dcc58ec3e31f689abdf8dce29f54d0fb7b9a (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 2c49627bb0cf49423fa9c9be4822282674df2039
Author: Bill Erickson <berickxx at gmail.com>
Date:   Wed May 23 11:13:16 2018 -0400

    LP#1560805 Webstaff locale picker repair
    
    Make the locale picker less finicky by replacing the search/replace
    regex with a simple static URL for applying the locale.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/web/js/ui/default/staff/services/navbar.js b/Open-ILS/web/js/ui/default/staff/services/navbar.js
index 2702fc05f0..b6ff1d31fe 100644
--- a/Open-ILS/web/js/ui/default/staff/services/navbar.js
+++ b/Open-ILS/web/js/ui/default/staff/services/navbar.js
@@ -66,11 +66,8 @@ angular.module('egCoreMod')
                     // URL, since it creates an intermediate path change.
                     // Instead, use the ham-fisted approach of killing any
                     // search args and applying the args we want.
-                    $window.location.href = 
-                        $window.location.href.replace(
-                            /(\?|\&).*/,
-                            '?set_eg_locale=' + encodeURIComponent(locale)
-                        );
+                    $window.location.href = egCore.env.basePath +
+                        '?set_eg_locale=' + encodeURIComponent(locale);
                 }
 
                 $scope.changeOperatorUndo = function() {

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

Summary of changes:
 Open-ILS/web/js/ui/default/staff/services/navbar.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS