[open-ils-commits] [GIT] Evergreen ILS branch rel_2_6 updated. cd41e5ca11f39894196bc5021e4aad3225b99898

[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_2_6 has been updated
       via  cd41e5ca11f39894196bc5021e4aad3225b99898 (commit)
      from  9a3d9d67f98907527f8c6f45b1660124d94f74b8 (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 cd41e5ca11f39894196bc5021e4aad3225b99898
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Feb 23 20:25:02 2015 +0000

    LP#1154579: explicitly alert if copy location failed to be deleted
    
    This patch adds an alert if the act of deleting a copy
    location in the staff interface fails -- which would
    most commonly happen if there are still active items
    attached to the location to be deleted.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/xul/staff_client/server/admin/copy_locations.js b/Open-ILS/xul/staff_client/server/admin/copy_locations.js
index 6ce174f..da25abc 100644
--- a/Open-ILS/xul/staff_client/server/admin/copy_locations.js
+++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.js
@@ -288,7 +288,10 @@ function clDelete( cl, tbody, row ) {
     var req = new Request( DELETE_CL, SESSION, cl.id() );
     req.send(true);
     var res = req.result();
-    if(checkILSEvent(res)) throw res;
+    if (checkILSEvent(res)) {
+        alertILSEvent(res);
+        return;
+    }
     alertId('cl_update_success');
     clGo();
 }

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

Summary of changes:
 .../staff_client/server/admin/copy_locations.js    |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS