[open-ils-commits] r13772 - in trunk/Open-ILS/xul/staff_client/server: locale/en-US patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-07-29 05:05:03 -0400 (Wed, 29 Jul 2009)
New Revision: 13772

Modified:
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
   trunk/Open-ILS/xul/staff_client/server/patron/util.js
Log:
column tweaks for standing penalties in lists

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties	2009-07-29 09:04:45 UTC (rev 13771)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties	2009-07-29 09:05:03 UTC (rev 13772)
@@ -66,7 +66,7 @@
 staff.bills_xact_dates_label=Record / Dates
 staff.bills_information=Information
 staff.bills_current_payment_label=Current Payment
-staff.csp_id_label=Penalty ID
+staff.csp_id_label=Penalty Type ID
 staff.csp_name_label=Name
 staff.csp_label_label=Label
 staff.csp_block_list_label=Block List
@@ -79,6 +79,7 @@
 staff.csp_block_renew_no=
 staff.csp_block_hold_yes=Yes
 staff.csp_block_hold_no=
+staff.ausp_id_label=Penalty ID 
 staff.ausp_staff_label=Applied By 
 staff.ausp_set_date_label=Applied On 
 staff.ausp_note_label=Note 

Modified: trunk/Open-ILS/xul/staff_client/server/patron/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/util.js	2009-07-29 09:04:45 UTC (rev 13771)
+++ trunk/Open-ILS/xul/staff_client/server/patron/util.js	2009-07-29 09:05:03 UTC (rev 13772)
@@ -268,40 +268,47 @@
 	var c = [
 		{
 			'persist' : 'hidden width ordinal', 'id' : 'csp_id', 'label' : commonStrings.getString('staff.csp_id_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.csp.id(); }
+			'primary' : false, 'hidden' : true, 'render' : function(my) { return typeof my.csp == 'object' ? my.csp.id() : my.csp; }
 		},
 		{
 			'persist' : 'hidden width ordinal', 'id' : 'csp_name', 'label' : commonStrings.getString('staff.csp_name_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.csp.name(); }
+			'primary' : false, 'hidden' : true, 'render' : function(my) { return typeof my.csp == 'object' ? my.csp.name() : data.hash.csp[ my.csp ].name(); }
 		},
 		{
 			'persist' : 'hidden width ordinal', 'id' : 'csp_label', 'label' : commonStrings.getString('staff.csp_label_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : false, 'render' : function(my) { return my.csp.label(); }
+			'primary' : false, 'hidden' : false, 'render' : function(my) { return typeof my.csp == 'object' ? my.csp.label() : data.hash.csp[ my.csp ].label(); }
 		},
 		{
 			'persist' : 'hidden width ordinal', 'id' : 'csp_block_list', 'label' : commonStrings.getString('staff.csp_block_list_label'), 'flex' : 1,
-			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.csp.block_list(); }
+			'primary' : false, 'hidden' : true, 'render' : function(my) { return typeof my.csp == 'object' ? my.csp.block_list() : data.hash.csp[ my.csp ].block_list(); }
 		},
 		{
 			'persist' : 'hidden width ordinal', 'id' : 'csp_block_circ', 'label' : commonStrings.getString('staff.csp_block_circ_label'), 'flex' : 1,
 			'primary' : false, 'hidden' : true, 'render' : function(my) { 
-                return String( my.csp.block_list() ).match('CIRC') ? commonStrings.getString('staff.csp_block_circ_yes') : commonStrings.getString('staff.csp_block_circ_no'); 
+                var my_csp = typeof my.csp == 'object' ? my.csp : data.hash.csp[ my.csp ];
+                return String( my_csp.block_list() ).match('CIRC') ? commonStrings.getString('staff.csp_block_circ_yes') : commonStrings.getString('staff.csp_block_circ_no'); 
             }
 		},
 		{
 			'persist' : 'hidden width ordinal', 'id' : 'csp_block_renew', 'label' : commonStrings.getString('staff.csp_block_renew_label'), 'flex' : 1,
 			'primary' : false, 'hidden' : true, 'render' : function(my) { 
-                return String( my.csp.block_list() ).match('RENEW') ? commonStrings.getString('staff.csp_block_renew_yes') : commonStrings.getString('staff.csp_block_renew_no'); 
+                var my_csp = typeof my.csp == 'object' ? my.csp : data.hash.csp[ my.csp ];
+                return String( my_csp.block_list() ).match('RENEW') ? commonStrings.getString('staff.csp_block_renew_yes') : commonStrings.getString('staff.csp_block_renew_no'); 
 
             }
 		},
 		{
 			'persist' : 'hidden width ordinal', 'id' : 'csp_block_hold', 'label' : commonStrings.getString('staff.csp_block_hold_label'), 'flex' : 1,
 			'primary' : false, 'hidden' : true, 'render' : function(my) { 
-                return String( my.csp.block_list() ).match('HOLD') ?  commonStrings.getString('staff.csp_block_hold_yes') : commonStrings.getString('staff.csp_block_hold_no'); 
+                var my_csp = typeof my.csp == 'object' ? my.csp : data.hash.csp[ my.csp ];
+                return String( my_csp.block_list() ).match('HOLD') ?  commonStrings.getString('staff.csp_block_hold_yes') : commonStrings.getString('staff.csp_block_hold_no'); 
             }
 		},
 		{
+			'persist' : 'hidden width ordinal', 'id' : 'ausp_id', 'label' : commonStrings.getString('staff.ausp_id_label'), 'flex' : 1,
+			'primary' : false, 'hidden' : true, 'render' : function(my) { return my.ausp ? my.ausp.id() : ''; }
+		},
+		{
 			'persist' : 'hidden width ordinal', 'id' : 'ausp_staff', 'label' : commonStrings.getString('staff.ausp_staff_label'), 'flex' : 1,
 			'primary' : false, 'hidden' : true, 'render' : function(my) { 
                 return my.ausp ? my.ausp.staff() : '';