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

[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  0e11b0198021b4da1987090e649b0717d4168db8 (commit)
      from  60eec432440657a51e8fd0fb6622e5620750ab9f (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 0e11b0198021b4da1987090e649b0717d4168db8
Author: Bill Erickson <berickxx at gmail.com>
Date:   Wed May 23 11:54:34 2018 -0400

    LP#1537228 Precat subsequent checkin shows route alert
    
    Display the 'route to cataloging' alert every time a precat copy is
    checked in, consistent with the XUL client, instead of displaying
    it only with the first checkin.
    
    As with the first checkin, if the alert is configured not to display,
    it will not show.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 2807464..6be7dc4 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -1526,7 +1526,12 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,  egAddCopyAl
                     case 11: /* CATALOGING */
                         egCore.audio.play('info.checkin.cataloging');
                         evt[0].route_to = egCore.strings.ROUTE_TO_CATALOGING;
-                        return $q.when(final_resp);
+                        if (options.no_precat_alert)
+                            return $q.when(final_resp);
+                        return egAlertDialog.open(
+                            egCore.strings.PRECAT_CHECKIN_MSG, params)
+                            .result.then(function() {return final_resp});
+
 
                     case 15: /* ON_RESERVATION_SHELF */
                         egCore.audio.play('info.checkin.reservation');

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

Summary of changes:
 .../web/js/ui/default/staff/circ/services/circ.js  |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS