From 79c6f2de45b305c04be8108c370b8881c8d43cc4 Mon Sep 17 00:00:00 2001 From: phasefx Date: Wed, 29 Jul 2009 09:05:03 +0000 Subject: [PATCH] column tweaks for standing penalties in lists git-svn-id: svn://svn.open-ils.org/ILS/trunk@13772 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../server/locale/en-US/common.properties | 3 ++- Open-ILS/xul/staff_client/server/patron/util.js | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties index c97e6b9d91..1b8b43595a 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/common.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/common.properties @@ -66,7 +66,7 @@ staff.mvr_label_title=Title 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_yes=Yes 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 diff --git a/Open-ILS/xul/staff_client/server/patron/util.js b/Open-ILS/xul/staff_client/server/patron/util.js index deb0274fc5..68b223916f 100644 --- a/Open-ILS/xul/staff_client/server/patron/util.js +++ b/Open-ILS/xul/staff_client/server/patron/util.js @@ -268,40 +268,47 @@ patron.util.ausp_columns = function(modify,params) { 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() : ''; -- 2.11.0