[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 7f00e5a3cd285d1c45dd56306eca5ef7c4d3148b

[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_2 has been updated
       via  7f00e5a3cd285d1c45dd56306eca5ef7c4d3148b (commit)
      from  72f26245eea25f473fc4a5febc50175ac5d0e815 (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 7f00e5a3cd285d1c45dd56306eca5ef7c4d3148b
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Fri Aug 24 10:48:39 2012 -0400

    Remove broken error message
    
    Checkout fills related hold causes an empty array sometimes, so don't throw
    out errors for that.
    
    Also, the original error would itself fail, throwing an error that would
    then fail as well, likely due to a copy/paste issue.
    
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/xul/staff_client/server/admin/transit_list.js b/Open-ILS/xul/staff_client/server/admin/transit_list.js
index 2d841ce..522cecc 100644
--- a/Open-ILS/xul/staff_client/server/admin/transit_list.js
+++ b/Open-ILS/xul/staff_client/server/admin/transit_list.js
@@ -278,7 +278,8 @@ admin.transit_list.prototype = {
                                     var r_ahr = req3.getResultObject();
                                     if (typeof r_ahr.ilsevent != 'undefined') throw(r_ahr);
                                     if (r_ahr.length == 0) {
-                                        try { obj.error.standard_unexpected_error_alert(document.getElementById('adminStrings').getString('staff.admin.transit_list.empty_array.error') + document.getElementById('adminStrings').getFormattedString('staff.admin.transit_list.empty_array.error', [r_atc.hold(), transit_id]),E); } catch(F) { alert(E); }
+                                        // This can apparently happen under normal operating conditions when "checkout fills related hold" is active.
+                                        // So don't throw an error, just pretend that it wasn't a hold transit.
                                         do_this(r_atc,null);
                                     } else {
                                         if (instanceOf(r_ahr[0],ahr)) {

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

Summary of changes:
 .../xul/staff_client/server/admin/transit_list.js  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS