From b8d3eace38d3440a934cf7fd7e264cc6bf0a868a Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 14 Dec 2005 17:43:39 +0000
Subject: [PATCH] bugs

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2377 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/xul/staff_client/server/circ/checkin.js  |  4 +---
 Open-ILS/xul/staff_client/server/circ/checkout.js |  3 ---
 Open-ILS/xul/staff_client/server/circ/util.js     | 10 ++++++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.js b/Open-ILS/xul/staff_client/server/circ/checkin.js
index f3a806e99d..a5d25525ca 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.js
@@ -5,9 +5,6 @@ circ.checkin = function (params) {
 
 	JSAN.use('util.error'); this.error = new util.error();
 	JSAN.use('util.network'); this.network = new util.network();
-
-	JSAN.use('OpenILS.data'); this.OpenILS = {};
-	this.OpenILS.data = new OpenILS.data(); this.OpenILS.data.init({'via':'stash'});
 }
 
 circ.checkin.prototype = {
@@ -26,6 +23,7 @@ circ.checkin.prototype = {
 				'status' : { 'hidden' : false },
 			} 
 		);
+		dump('columns = ' + js2JSON(columns) + '\n');
 
 		JSAN.use('util.list'); obj.list = new util.list('checkin_list');
 		obj.list.init(
diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index aef784e43b..d65c83f294 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -5,9 +5,6 @@ circ.checkout = function (params) {
 
 	JSAN.use('util.error'); this.error = new util.error();
 	JSAN.use('util.network'); this.network = new util.network();
-
-	JSAN.use('OpenILS.data'); this.OpenILS = {};
-	this.OpenILS.data = new OpenILS.data(); this.OpenILS.data.init({'via':'stash'});
 }
 
 circ.checkout.prototype = {
diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 3894c34fb0..bae3f6d70d 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -10,7 +10,9 @@ circ.util.EXPORT_TAGS	= { ':all' : circ.util.EXPORT_OK };
 
 circ.util.columns = function(modify) {
 	
-	function getString(s) { return obj.OpenILS.data.entities[s]; }
+	JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'});
+
+	function getString(s) { return data.entities[s]; }
 
 	var c = [
 		{
@@ -102,10 +104,10 @@ circ.util.columns = function(modify) {
 			'primary' : false, 'hidden' : true, 'render' : 'obj.OpenILS.data.hash.ccs[ my.acp.status() ].name()'
 		},
 	];
-	for (var i = 0; i < c.length; c++) {
+	for (var i = 0; i < c.length; i++) {
 		if (modify[ c[i].id ]) {
-			for (var j in modify) {
-				c[i][j] = modify[j];
+			for (var j in modify[ c[i].id ]) {
+				c[i][j] = modify[ c[i].id ][j];
 			}
 		}
 	}
-- 
2.43.2