[open-ils-commits] [GIT] Evergreen ILS branch rel_2_4 updated. 6055cc4a3460c056cc33bf47eac7f989da3c749d

[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_4 has been updated
       via  6055cc4a3460c056cc33bf47eac7f989da3c749d (commit)
      from  f4e5f0f9f6ae0cddebad0cd903b0aa6b1361b52b (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 6055cc4a3460c056cc33bf47eac7f989da3c749d
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Tue Jun 26 11:39:48 2012 -0400

    fix clear hold shelf with 25 or more holds
    
    When there are 25 or more shelf expired holds to be processed, the API call
    returns an array of objects instead of an object, which the staff client wasn't
    prepared to accommodate. This fixes that.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js
index b8d151a..67ad4a9 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.js
+++ b/Open-ILS/xul/staff_client/server/patron/holds.js
@@ -1903,9 +1903,21 @@ patron.holds.prototype = {
                 ]
             );
             if (typeof robj.ilsevent != 'undefined') { throw(robj); }
-            if (typeof robj.cache_key == 'undefined') { throw(robj); }
 
-            var cache_key = robj.cache_key;
+            var cache_key;
+            if (typeof robj.cache_key != 'undefined') {
+                cache_key = robj.cache_key;
+            } else {
+                if (robj.constructor == Array) {
+                    for (var i = 0; i < robj.length; i++) {
+                        if (typeof robj[i].cache_key != 'undefined') {
+                            cache_key = robj[i].cache_key;
+                        }
+                    }
+                }
+            }
+
+            if (!cache_key) { throw(robj); }
 
             // id's in xulG.holds will prevent the normal retrieval method from
             // firing.  Let's put our affected hold.id's in here:

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

Summary of changes:
 Open-ILS/xul/staff_client/server/patron/holds.js |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS