[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. e663cbf61114980cec74d6528d9796b5ba474bab

[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_0 has been updated
       via  e663cbf61114980cec74d6528d9796b5ba474bab (commit)
      from  12c6acbded284d055a227b89b29f4dc8ddde637b (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 e663cbf61114980cec74d6528d9796b5ba474bab
Author: Jason Stephenson <jason at sigio.com>
Date:   Tue Apr 10 10:51:24 2018 -0400

    LP#1751126: Make print holds shelf list aware of clear mode.
    
    We change the Print Full List button on the holds shelf view to be
    aware of whether clear mode is active.  If clear mode is active, then
    the list of holds to clear is printed.  If not, then the full holds
    shelf list is printed.
    
    This commit does not change the label of the print full list button.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Dawn Dale <ddale at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/holds/app.js b/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
index 8028da5..fc9ea34 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
@@ -204,9 +204,12 @@ function($scope , $q , $routeParams , $window , $location , egCore , egHolds , e
         $scope.print_list_progress = 0;
 
         // collect the full list of holds
+        var method = 'open-ils.circ.captured_holds.id_list.on_shelf.retrieve.authoritative.atomic';
+        if (clear_mode)
+            method = 'open-ils.circ.captured_holds.id_list.expired_on_shelf_or_wrong_shelf.retrieve.atomic';
         egCore.net.request(
             'open-ils.circ',
-            'open-ils.circ.captured_holds.id_list.on_shelf.retrieve.authoritative.atomic',
+            method,
             egCore.auth.token(), $scope.pickup_ou.id()
         ).then( function(idlist) {
 

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

Summary of changes:
 Open-ILS/web/js/ui/default/staff/circ/holds/app.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS