From 4b03c2588204126d27ea84b633bbcda851e908d5 Mon Sep 17 00:00:00 2001 From: phasefx Date: Thu, 11 Mar 2010 10:11:15 +0000 Subject: [PATCH] backport changeset 15162: this should fix some of those set_text on column errors in bill Full Details git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6_0@15788 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../xul/staff_client/server/cat/copy_summary.xul | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) 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 eafeb249a3..bcb8f58507 100644 --- a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul +++ b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul @@ -94,16 +94,16 @@ function acn_callback(rreq) { try { - $w('barcode',copy.barcode()); - $w('ref',get_bool(copy.ref()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); - $w('opac_visible',get_bool(copy.opac_visible()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); - $w('circulate',get_bool(copy.circulate()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); - $w('holdable',get_bool(copy.holdable()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); - $w('age_protect',copy.age_protect() == null ? $('staff.cat.copy_summary.unset') : ( typeof copy.age_protect() == 'object' ? copy.age_protect().name() : g.data.hash.crahp[ copy.age_protect() ].name() ) ); - $w('location',typeof copy.location() == 'object' ? copy.location().name() : g.data.lookup('acpl',copy.location()).name() ); - $w('create_date',util.date.formatted_date(copy.create_date(),'%F')); - $w('edit_date',util.date.formatted_date(copy.edit_date(),'%F')); - $w('status',typeof copy.status() == 'object' ? copy.status().name() : g.data.hash.ccs[ copy.status() ].name() ); + $w('copy_summary_barcode',copy.barcode()); + $w('copy_summary_ref',get_bool(copy.ref()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); + $w('copy_summary_opac_visible',get_bool(copy.opac_visible()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); + $w('copy_summary_circulate',get_bool(copy.circulate()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); + $w('copy_summary_holdable',get_bool(copy.holdable()) ? $('catStrings').getString('staff.cat.copy_summary.yes') : $('catStrings').getString('staff.cat.copy_summary.no')); + $w('copy_summary_age_protect',copy.age_protect() == null ? $('staff.cat.copy_summary.unset') : ( typeof copy.age_protect() == 'object' ? copy.age_protect().name() : g.data.hash.crahp[ copy.age_protect() ].name() ) ); + $w('copy_summary_location',typeof copy.location() == 'object' ? copy.location().name() : g.data.lookup('acpl',copy.location()).name() ); + $w('copy_summary_create_date',util.date.formatted_date(copy.create_date(),'%F')); + $w('copy_summary_edit_date',util.date.formatted_date(copy.edit_date(),'%F')); + $w('copy_summary_status',typeof copy.status() == 'object' ? copy.status().name() : g.data.hash.ccs[ copy.status() ].name() ); } catch(E) { g.error.standard_unexpected_error_alert('rendering copy',E); } @@ -112,14 +112,14 @@ if (typeof cn.ilsevent != 'undefined') { switch(Number(cn.ilsevent)) { case 1508 /* ASSET_CALL_NUMBER_NOT_FOUND */ : - $w('callnumber', $('catStrings').getString('staff.cat.copy_summary.not_cataloged')); + $w('copy_summary_callnumber', $('catStrings').getString('staff.cat.copy_summary.not_cataloged')); break; default: throw(cn); break; } } else { - $w('callnumber',cn.label()); + $w('copy_summary_callnumber',cn.label()); } g.list.append({'row':{'my':{'acp':copy,'acn':cn}}}); } catch(E) { @@ -151,7 +151,7 @@ try { var robj = req.getResultObject(); if (typeof robj.ilsevent != 'undefined') throw(robj); - $w('total_circs',robj.total.count); + $w('copy_summary_total_circs',robj.total.count); } catch(E) { g.error.standard_unexpected_error_alert('retrieving circ total',E); } @@ -202,33 +202,33 @@ -- 2.11.0