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

[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  0a9e00ed0ada77c89b4b0a10600a49e1989ccf10 (commit)
      from  26b4105f4c688bceefa9eb595503ec89547aade1 (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 0a9e00ed0ada77c89b4b0a10600a49e1989ccf10
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 f522390..bc351d3 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
@@ -1424,7 +1424,12 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
                     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