From 48bb0e9960e0e203ec84aae16af42a82865373ff Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Wed, 18 May 2011 02:14:52 -0400 Subject: [PATCH] fix CN prefix/suffix display in XUL interfaces so we can handle any affix we come across Signed-off-by: Jason Etheridge --- Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js | 10 ++++++++++ Open-ILS/xul/staff_client/server/circ/util.js | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js index f73f071d37..17a1ac943b 100644 --- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js +++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js @@ -181,6 +181,16 @@ OpenILS.data.prototype = { var obj = this; var found; if (obj.hash[key] && obj.hash[key][value]) return obj.hash[key][value]; switch(key) { + case 'acnp': + found = obj.network.simple_request('FM_ACNP_RETRIEVE_VIA_PCRUD',[ ses(), { 'id' : { '=' : value } }]); + if (typeof found.ilsevent != 'undefined') throw(js2JSON(found)); + found = found[0]; + break; + case 'acns': + found = obj.network.simple_request('FM_ACNS_RETRIEVE_VIA_PCRUD',[ ses(), { 'id' : { '=' : value } }]); + if (typeof found.ilsevent != 'undefined') throw(js2JSON(found)); + found = found[0]; + break; case 'acpl': found = obj.network.simple_request('FM_ACPL_RETRIEVE_VIA_ID.authoritative',[ value ]); break; diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 14bffaba1d..985941595c 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -641,7 +641,7 @@ circ.util.columns = function(modify,params) { if (typeof my.acn == 'undefined') return ''; return (typeof my.acn.prefix() == 'object') ? my.acn.prefix().label() - : data.hash.acnp[ my.acn.prefix() ].label(); + : data.lookup("acnp", my.acn.prefix() ).label(); }, 'persist' : 'hidden width ordinal' }, @@ -656,7 +656,7 @@ circ.util.columns = function(modify,params) { if (typeof my.acn == 'undefined') return ''; return (typeof my.acn.suffix() == 'object') ? my.acn.suffix().label() - : data.hash.acns[ my.acn.suffix() ].label(); + : data.lookup("acns", my.acn.suffix() ).label(); }, 'persist' : 'hidden width ordinal' }, -- 2.11.0