From eda56a07ed320d6e2497fbf31ea63af377a9bc74 Mon Sep 17 00:00:00 2001 From: phasefx Date: Wed, 14 Dec 2005 21:37:25 +0000 Subject: [PATCH] fixes git-svn-id: svn://svn.open-ils.org/ILS/trunk@2381 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../xul/staff_client/server/circ/checkin.js | 2 +- .../xul/staff_client/server/circ/checkout.js | 2 +- Open-ILS/xul/staff_client/server/circ/util.js | 33 ++++++++++--------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.js b/Open-ILS/xul/staff_client/server/circ/checkin.js index d74597280e..108ec06aaa 100644 --- a/Open-ILS/xul/staff_client/server/circ/checkin.js +++ b/Open-ILS/xul/staff_client/server/circ/checkin.js @@ -30,7 +30,7 @@ circ.checkin.prototype = { obj.list.init( { 'columns' : columns, - 'map_row_to_column' : circ.util.std_map_row_to_column, + 'map_row_to_column' : circ.util.std_map_row_to_column(), } ); diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js index 17e7a8d1fb..1b5d259004 100644 --- a/Open-ILS/xul/staff_client/server/circ/checkout.js +++ b/Open-ILS/xul/staff_client/server/circ/checkout.js @@ -30,7 +30,7 @@ circ.checkout.prototype = { obj.list.init( { 'columns' : columns, - 'map_row_to_column' : circ.util.std_map_row_to_column, + 'map_row_to_column' : circ.util.std_map_row_to_column(), } ); diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index cddfe421b2..db60ffbdd9 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -114,23 +114,24 @@ circ.util.columns = function(modify) { return c; } -circ.util.std_map_row_to_column = function(row,col) { - // row contains { 'my' : { 'acp' : {}, 'circ' : {}, 'mvr' : {} } } - // col contains one of the objects listed above in columns - - // mimicking some of the obj in circ.checkin and circ.checkout where map_row_to_column is usually defined - var obj = {}; obj.OpenILS = {}; - JSAN.use('OpenILS.data'); obj.OpenILS.data = new OpenILS.data(); data.init({'via':'stash'}); +circ.util.std_map_row_to_column = function() { + return function(row,col) { + // row contains { 'my' : { 'acp' : {}, 'circ' : {}, 'mvr' : {} } } + // col contains one of the objects listed above in columns + + // mimicking some of the obj in circ.checkin and circ.checkout where map_row_to_column is usually defined + var obj = {}; obj.OpenILS = {}; // One of our circ columns uses OpenILS.data + JSAN.use('OpenILS.data'); obj.OpenILS.data = new OpenILS.data(); obj.OpenILS.data.init({'via':'stash'}); - var my = row.my; - var value; - try { - value = eval( col.render; ) - } catch(E) { - obj.error.sdump('D_ERROR','map_row_to_column: ' + E); - value = '???'; + var my = row.my; + var value; + try { + value = eval( col.render ); + } catch(E) { + obj.error.sdump('D_ERROR','map_row_to_column: ' + E); + value = '???'; + } + return value; } - return value; } - dump('exiting circ/util.js\n'); -- 2.43.2