From 68a5f76ca5ed6aac23d217fa7c7acead43b9502c Mon Sep 17 00:00:00 2001 From: pines Date: Mon, 5 Mar 2007 20:06:33 +0000 Subject: [PATCH] checkout lib column and some sanity checking for circ details git-svn-id: svn://svn.open-ils.org/ILS/trunk@7026 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/circ/util.js | 4 ++++ Open-ILS/xul/staff_client/server/patron/items.js | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 38a35a3aa0..14b173088f 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -512,6 +512,10 @@ circ.util.columns = function(modify,params) { 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.acp.circ_modifier(); }, }, { + 'persist' : 'hidden width ordinal', 'id' : 'checkout_lib', 'label' : 'Checkout Lib', 'flex' : 1, + 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.circ ? data.hash.aou[ my.circ.circ_lib() ].shortname() : ( my.acp.circulations() ? data.hash.aou[ my.acp.circulations()[0].circ_lib() ].shortname() : ""); }, + }, + { 'persist' : 'hidden width ordinal', 'id' : 'xact_start_full', 'label' : 'Checkout Timestamp', 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : function(my) { return my.circ ? my.circ.xact_start() : (my.acp.circulations() ? my.acp.circulations()[0].xact_start() : ""); }, }, diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js index be6b769a1b..db01d081c4 100644 --- a/Open-ILS/xul/staff_client/server/patron/items.js +++ b/Open-ILS/xul/staff_client/server/patron/items.js @@ -526,6 +526,7 @@ patron.items.prototype = { var columns = circ.util.columns( { 'barcode' : { 'hidden' : false }, + 'checkout_lib' : { 'hidden' : false }, 'circ_lib' : { 'hidden' : false }, 'title' : { 'hidden' : false, 'flex' : '3' }, 'due_date' : { 'hidden' : false }, @@ -536,6 +537,7 @@ patron.items.prototype = { var columns2 = circ.util.columns( { 'barcode' : { 'hidden' : false }, + 'checkout_lib' : { 'hidden' : false }, 'circ_lib' : { 'hidden' : false }, 'title' : { 'hidden' : false, 'flex' : '3' }, 'checkin_time' : { 'hidden' : false }, @@ -557,6 +559,8 @@ patron.items.prototype = { function(req) { try { var robj = req.getResultObject(); + if (typeof robj.ilsevent != 'undefined') throw(robj); + if (typeof robj.ilsevent == 'null') throw('null result'); row.my.circ = robj.circ; row.my.acp = robj.copy; row.my.mvr = robj.mvr; @@ -579,7 +583,7 @@ patron.items.prototype = { params.on_retrieve(row); } } catch(E) { - obj.error.standard_unexpected_error_alert('circ details',E); + obj.error.standard_unexpected_error_alert('Error in callback for FM_CIRC_DETAILS in patron/items.js',E); } } ); -- 2.11.0