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

[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  fc886e1d96a6bf5f78da305d94a0b4271ca2dbe4 (commit)
      from  baf337b63d09b24a516881a91366da714e472c92 (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 fc886e1d96a6bf5f78da305d94a0b4271ca2dbe4
Author: Bill Erickson <berickxx at gmail.com>
Date:   Thu Aug 31 21:14:32 2017 -0400

    LP#1709521 Apply recent patrons from checkout
    
    Load the max recent patrons setting directly in the patron service
    instead of requring the calling UI to apply it.  This fixes an issue
    where recent patrons are not set from the checkout-by-barcode
    interface.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/services/patron_search.js b/Open-ILS/web/js/ui/default/staff/services/patron_search.js
index 21e477d..c27274f 100644
--- a/Open-ILS/web/js/ui/default/staff/services/patron_search.js
+++ b/Open-ILS/web/js/ui/default/staff/services/patron_search.js
@@ -48,6 +48,18 @@ function($q , $timeout , $location , egCore,  egUser , egConfirmDialog , $locale
     }
     service.resetPatronLists();  // initialize
 
+    // Max recents setting is loaded and scrubbed during egStartup.
+    // Copy it to a local variable here for ease of local access
+    // after startup has run.
+    egCore.startup.go().then(
+        function() {
+            egCore.org.settings('ui.staff.max_recent_patrons')
+            .then(function(s) {
+                service.maxRecentPatrons = s['ui.staff.max_recent_patrons'];
+            });
+        }
+    );
+
     // Returns true if the last alerted patron matches the current
     // patron.  Otherwise, the last alerted patron is set to the 
     // current patron and false is returned.
@@ -509,12 +521,6 @@ function($scope,  $q,  $routeParams,  $timeout,  $window,  $location,  egCore,
         selectedItems : function() {return []}
     }
 
-    // Max recents setting is loaded and scrubbed during egStartup.
-    // Copy it to a local variable here for ease of local access.
-    egCore.org.settings('ui.staff.max_recent_patrons').then(function(s) {
-        patronSvc.maxRecentPatrons = s['ui.staff.max_recent_patrons'];
-    });
-
     // The first time we encounter the show-recent CGI param, put the
     // service into show-recent mode.  The first time recents are shown,
     // the service is taken out of show-recent mode so the page does not

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

Summary of changes:
 .../js/ui/default/staff/services/patron_search.js  |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Evergreen ILS