[open-ils-commits] [GIT] Evergreen ILS branch master updated. 23a2f501b5ef8ce6aa91d39dba9a34aaf09809cc

[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  23a2f501b5ef8ce6aa91d39dba9a34aaf09809cc (commit)
       via  a96707bee72dc66b4385f7500ec80ea1530094db (commit)
      from  8acac4652ca08321a117ad2292493d7755b48460 (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 23a2f501b5ef8ce6aa91d39dba9a34aaf09809cc
Author: Jason Boyer <jboyer at library.in.gov>
Date:   Mon Dec 3 13:23:39 2018 -0500

    LP1799963: Adjust fix to Staff Default Adv Search
    
    By moving the only assignment to $scope.catalog_url inside
    an if(<url is advanced search>) then only the advanced search
    page can load in the opac. By adding a second assignment
    inside an else block all opac pages can load again.
    
    Signed-off-by: Jason Boyer <jboyer at library.in.gov>
    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/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
index c8a1a365d0..7d525c5f43 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
@@ -1926,7 +1926,9 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
 
                 $scope.catalog_url = url;
             });
-        }
+        } else {
+            $scope.catalog_url = url;
+	}
 
     }
 

commit a96707bee72dc66b4385f7500ec80ea1530094db
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Thu Oct 25 17:54:42 2018 -0400

    LP#1799963 - fix catalog advanced search type default
    
    Since eg.search.adv_pane is now a server stored WS setting
    it needed to be fetched with the proper way in order to work.
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    Signed-off-by: Angela Kilsdonk <akilsdonk at equinoxinitiative.org>
    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/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
index 422ebeb34d..c8a1a365d0 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
@@ -1919,13 +1919,15 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
         // whatever default pane the user has chosen via workstation
         // preference
         if (url.match(/\/opac\/advanced$/)) {
-            var adv_pane = egCore.hatch.getLocalItem('eg.search.adv_pane');
-            if (adv_pane) {
-                url += '?pane=' + encodeURIComponent(adv_pane);
-            }
+            egCore.hatch.getItem('eg.search.adv_pane').then(function(adv_pane_val){
+                if (adv_pane_val) {
+                    url += '?pane=' + encodeURIComponent(adv_pane_val);
+                }
+
+                $scope.catalog_url = url;
+            });
         }
 
-        $scope.catalog_url = url;
     }
 
     function init_parts_url() {

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

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


hooks/post-receive
-- 
Evergreen ILS