From: pines <pines@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sat, 30 Sep 2006 19:50:21 +0000 (+0000)
Subject: missed some column definitions for the new row eval
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f6eabbd32b2bcde57b64046006ce3bb7b58b0133;p=Evergreen.git

missed some column definitions for the new row eval


git-svn-id: svn://svn.open-ils.org/ILS/trunk@6298 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.js b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.js
index 664a324d37..9406f03dec 100644
--- a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.js
+++ b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.js
@@ -60,52 +60,52 @@ admin.offline_manage_xacts.prototype = {
 				{
 					'id' : 'org', 'hidden' : 'true', 'flex' : '1',
 					'label' : 'Organization',
-					'render' : 'data.hash.aou[ my.org ].shortname()',
+					'render' : 'v = data.hash.aou[ my.org ].shortname(); v;',
 				},
 				{ 
 					'id' : 'description', 'flex' : '2',
 					'label' : 'Description', 
-					'render' : "my.description", 
+					'render' : "v = my.description; v;", 
 				},
 				{
 					'id' : 'create_time', 'flex' : '1',
 					'label' : 'Date Created',
-					'render' : 'if (my.create_time) { var x = new Date(); x.setTime(my.create_time+"000"); util.date.formatted_date(x,"%F %H:%M"); } else { ""; }',
+					'render' : 'if (my.create_time) { var x = new Date(); x.setTime(my.create_time+"000"); v = util.date.formatted_date(x,"%F %H:%M"); } else { v = ""; }; v;',
 				},
 				{
 					'id' : 'creator', 'flex' : '1', 'hidden' : 'true',
 					'label' : 'Created By',
-					'render' : 'JSAN.use("patron.util"); var staff_obj = patron.util.retrieve_name_via_id( ses(), my.creator ); staff_obj[0] + " @ " + obj.data.hash.aou[ staff_obj[3] ].shortname();',
+					'render' : 'JSAN.use("patron.util"); var staff_obj = patron.util.retrieve_name_via_id( ses(), my.creator ); v = staff_obj[0] + " @ " + obj.data.hash.aou[ staff_obj[3] ].shortname(); v;',
 				},
 				{ 
 					'id' : 'count', 'flex' : '1',
 					'label' : 'Upload Count', 
-					'render' : "my.scripts.length", 
+					'render' : "v = my.scripts.length; v;", 
 				},
 				{ 
 					'id' : 'num_complete', 'flex' : '1', 
 					'label' : 'Transactions Processed', 
-					'render' : "my.num_complete", 
+					'render' : "v = my.num_complete; v;", 
 				},
 				{ 
 					'id' : 'in_process', 'flex' : '1',
 					'label' : 'Processing?', 
-					'render' : "if (my.end_time) { 'Completed' } else {my.in_process == 0 ? 'No' : 'Yes'}", 
+					'render' : "if (my.end_time) { v = 'Completed' } else { v = my.in_process == 0 ? 'No' : 'Yes'}; v;", 
 				},
 				{
 					'id' : 'start_time', 'flex' : '1', 'hidden' : 'true',
 					'label' : 'Date Started',
-					'render' : 'if (my.start_time) {var x = new Date(); x.setTime(my.start_time+"000"); util.date.formatted_date(x,"%F %H:%M");} else { ""; }',
+					'render' : 'if (my.start_time) {var x = new Date(); x.setTime(my.start_time+"000"); v = util.date.formatted_date(x,"%F %H:%M");} else { v = ""; }; v;',
 				},
 				{
 					'id' : 'end_time', 'flex' : '1',
 					'label' : 'Date Completed',
-					'render' : 'if (my.end_time) {var x = new Date(); x.setTime(my.end_time+"000"); util.date.formatted_date(x,"%F %H:%M");} else { ""; }',
+					'render' : 'if (my.end_time) {var x = new Date(); x.setTime(my.end_time+"000"); v = util.date.formatted_date(x,"%F %H:%M");} else { v = ""; }; v;',
 				},
 				{ 
 					'id' : 'key', 'hidden' : 'true', 'flex' : '1', 
 					'label' : 'Session', 
-					'render' : "my.key", 
+					'render' : "v = my.key; v;", 
 				},
 			],
 			'map_row_to_column' : function(row,col) {
@@ -198,22 +198,22 @@ admin.offline_manage_xacts.prototype = {
 				{
 					'id' : 'create_time', 'flex' : '1',
 					'label' : 'Date Uploaded',
-					'render' : 'if (my.create_time) { var x = new Date(); x.setTime(my.create_time+"000"); util.date.formatted_date(x,"%F %H:%M"); } else { ""; }',
+					'render' : 'if (my.create_time) { var x = new Date(); x.setTime(my.create_time+"000"); v = util.date.formatted_date(x,"%F %H:%M"); } else { v = ""; }; v;',
 				},
 				{
 					'id' : 'requestor', 'flex' : '1', 'hidden' : 'true',
 					'label' : 'Uploaded By',
-					'render' : 'JSAN.use("patron.util"); var staff_obj = patron.util.retrieve_name_via_id( ses(), my.requestor ); staff_obj[0] + " @ " + obj.data.hash.aou[ staff_obj[3] ].shortname();',
+					'render' : 'JSAN.use("patron.util"); var staff_obj = patron.util.retrieve_name_via_id( ses(), my.requestor ); v = staff_obj[0] + " @ " + obj.data.hash.aou[ staff_obj[3] ].shortname(); v;',
 				},
 				{ 
 					'id' : 'time_delta', 'hidden' : 'true', 'flex' : '1', 
 					'label' : 'Server/Local Time Delta', 
-					'render' : "my.time_delta", 
+					'render' : "v = my.time_delta; v;", 
 				},
 				{ 
 					'id' : 'workstation', 'flex' : '1', 
 					'label' : 'Workstation', 
-					'render' : "my.workstation", 
+					'render' : "v = my.workstation; v;", 
 				},
 			],
 			'map_row_to_column' : function(row,col) {
@@ -236,72 +236,72 @@ admin.offline_manage_xacts.prototype = {
 				{
 					'id' : 'workstation', 'flex' : '1',
 					'label' : 'Workstation',
-					'render' : 'my.command._workstation ? my.command._workstation : my.command._worksation',
+					'render' : 'v = my.command._workstation ? my.command._workstation : my.command._worksation; v;',
 				},
 				{
 					'id' : 'timestamp', 'flex' : '1',
 					'label' : 'Timestamp',
-					'render' : 'if (my.command.timestamp) { var x = new Date(); x.setTime(my.command.timestamp+"000"); util.date.formatted_date(x,"%F %H:%M"); } else { my.command._realtime; }',
+					'render' : 'if (my.command.timestamp) { var x = new Date(); x.setTime(my.command.timestamp+"000"); v = util.date.formatted_date(x,"%F %H:%M"); } else { v = my.command._realtime; }; v;',
 				},
 				{
 					'id' : 'type', 'flex' : '1',
 					'label' : 'Type',
-					'render' : 'my.command.type',
+					'render' : 'v = my.command.type; v;',
 				},
 				{ 
 					'id' : 'ilsevent', 'hidden' : 'true', 'flex' : '1', 
 					'label' : 'Event Code', 
-					'render' : "my.event.ilsevent", 
+					'render' : "v = my.event.ilsevent; v;", 
 				},
 				{ 
 					'id' : 'textcode', 'flex' : '1', 
 					'label' : 'Event Name', 
-					'render' : "JSAN.use('util.functional'); typeof my.event.textcode != 'undefined' ? my.event.textcode : util.functional.map_list( my.event, function(o) { return o.textcode; }).join('/')", 
+					'render' : "JSAN.use('util.functional'); v = typeof my.event.textcode != 'undefined' ? my.event.textcode : util.functional.map_list( my.event, function(o) { return o.textcode; }).join('/'); v;", 
 				},
 				{
 					'id' : 'desc', 'flex' : '1', 'hidden' : 'true',
 					'label' : 'Event Description',
-					'render' : "my.event.desc",
+					'render' : "v = my.event.desc; v;",
 				},
 				{
 					'id' : 'i_barcode', 'flex' : '1',
 					'label' : 'Item Barcode',
-					'render' : 'my.command.barcode ? my.command.barcode : ""',
+					'render' : 'v = my.command.barcode ? my.command.barcode : ""; v;',
 				},
 				{
 					'id' : 'p_barcode', 'flex' : '1',
 					'label' : 'Patron Barcode',
-					'render' : 'if (my.command.patron_barcode) { my.command.patron_barcode; } else { if (my.command.user.card.barcode) { my.command.user.card.barcode; } else { ""; } }',
+					'render' : 'if (my.command.patron_barcode) { v = my.command.patron_barcode; } else { if (my.command.user.card.barcode) { v = my.command.user.card.barcode; } else { v = ""; } }; v;',
 				},
 				{
 					'id' : 'duedate', 'flex' : '1', 'hidden' : 'true',
 					'label' : 'Due Date',
-					'render' : 'my.command.due_date || ""',
+					'render' : 'v = my.command.due_date || ""; v;',
 				},
 				{
 					'id' : 'backdate', 'flex' : '1', 'hidden' : 'true',
 					'label' : 'Check In Backdate',
-					'render' : 'my.command.backdate || ""',
+					'render' : 'v = my.command.backdate || ""; v;',
 				},
 				{
 					'id' : 'count', 'flex' : '1', 'hidden' : 'true',
 					'label' : 'In House Use Count',
-					'render' : 'my.command.count || ""',
+					'render' : 'v = my.command.count || ""; v;',
 				},
 				{
 					'id' : 'noncat', 'flex' : '1', 'hidden' : 'true',
 					'label' : 'Non-Cataloged?',
-					'render' : 'my.command.noncat == 1 ? "Yes" : "No"',
+					'render' : 'v = my.command.noncat == 1 ? "Yes" : "No"; v;',
 				},
 				{
 					'id' : 'noncat_type', 'flex' : '1', 'hidden' : 'true',
 					'label' : 'Non-Cataloged Type',
-					'render' : 'data.hash.cnct[ my.command.noncat_type ] ? data.hash.cnct[ my.command.noncat_type ].name() : ""',
+					'render' : 'v = data.hash.cnct[ my.command.noncat_type ] ? data.hash.cnct[ my.command.noncat_type ].name() : ""; v;',
 				},
 				{
 					'id' : 'noncat_count', 'flex' : '1', 'hidden' : 'true',
 					'label' : 'Non-Cataloged Count',
-					'render' : 'my.command.noncat_count || ""',
+					'render' : 'v = my.command.noncat_count || ""; v;',
 				},
 			],
 			'map_row_to_column' : function(row,col) {
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_browser.js b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
index 9f5c6e699e..c3d6580677 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_browser.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
@@ -1224,7 +1224,6 @@ cat.copy_browser.prototype = {
 			if (parent_org) {
 				data.node = obj.map_tree[ 'aou_' + parent_org.id() ];
 			}
-
 			var node = obj.list.append(data);
 			if (params) {
 				for (var i in params) {
@@ -1364,17 +1363,17 @@ cat.copy_browser.prototype = {
 				{
 					'id' : 'tree_location', 'label' : 'Location/Barcode', 'flex' : 1,
 					'primary' : true, 'hidden' : false, 
-					'render' : 'my.acp ? my.acp.barcode() : my.acn ? my.acn.label() : my.aou ? my.aou.shortname() + " : " + my.aou.name() : "???"'
+					'render' : 'v = my.acp ? my.acp.barcode() : my.acn ? my.acn.label() : my.aou ? my.aou.shortname() + " : " + my.aou.name() : "???"; v;'
 				},
 				{
 					'id' : 'volume_count', 'label' : 'Volumes', 'flex' : 0,
 					'primary' : false, 'hidden' : false, 
-					'render' : 'my.volume_count'
+					'render' : 'v = my.volume_count; v;'
 				},
 				{
 					'id' : 'copy_count', 'label' : 'Copies', 'flex' : 0,
 					'primary' : false, 'hidden' : false, 
-					'render' : 'my.copy_count'
+					'render' : 'v = my.copy_count; v;'
 				},
 			].concat(
 				circ.util.columns( 
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
index c09f691c2d..9f786f58af 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
@@ -73,7 +73,7 @@
 					{
 						'id' : 'total_circs', 'label' : 'Total Circs', 'flex' : 1,
 						'primary' : false, 'hidden' : false, 'persist' : 'hidden width ordinal',
-						'render' : 'obj.network.simple_request("FM_CIRC_COUNT_RETRIEVE_VIA_COPY",[ my.acp.id() ]).total.count' 
+						'render' : 'v = obj.network.simple_request("FM_CIRC_COUNT_RETRIEVE_VIA_COPY",[ my.acp.id() ]).total.count; v;' 
 					}
 				);