From 5992dd30fafda48d7226939332ddb029ac83bca1 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 28 Dec 2011 13:58:45 -0500 Subject: [PATCH] Use hold current shelf lib to determine availability : hold shelf browse The availability of a hold can now be determined by hold.current_shelf_lib == hold.pickup_lib. This change updates the staff client code to only display the "available on" value (i.e. shelf_time) in the holds list when the current_shelf_lib == pickup_lib and not just that it's captured and on a shelf. Signed-off-by: Bill Erickson --- Open-ILS/xul/staff_client/server/circ/util.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 95b91a71f6..3b16945843 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -1884,11 +1884,8 @@ circ.util.hold_columns = function(modify,params) { 'primary' : false, 'hidden' : false, 'editable' : false, 'render' : function(my) { - if (my.ahr.transit() && my.ahr.transit().dest_recv_time()) { - return util.date.formatted_date( my.ahr.transit().dest_recv_time(), '%{localized}' ); - } - if (!my.ahr.transit() && my.ahr.capture_time()) { - return util.date.formatted_date( my.ahr.capture_time(), '%{localized}' ); + if (my.ahr.current_shelf_lib() == my.ahr.pickup_lib()) { + return util.date.formatted_date( my.ahr.shelf_time(), '%{localized}' ); } return ""; } -- 2.11.0