From d8e009112c4b05f182ccc742ae5bace2d7acfe6e Mon Sep 17 00:00:00 2001 From: phasefx Date: Thu, 17 Aug 2006 16:51:24 +0000 Subject: [PATCH] id collision git-svn-id: svn://svn.open-ils.org/ILS/trunk@5564 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../xul/staff_client/server/patron/bill_details.xul | 2 +- Open-ILS/xul/staff_client/server/patron/util.js | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/patron/bill_details.xul b/Open-ILS/xul/staff_client/server/patron/bill_details.xul index 56a00a9fc3..a6837f07a7 100644 --- a/Open-ILS/xul/staff_client/server/patron/bill_details.xul +++ b/Open-ILS/xul/staff_client/server/patron/bill_details.xul @@ -167,7 +167,7 @@ function retrieve_mp() { var mp_list = g.network.simple_request( 'FM_MP_RETRIEVE_VIA_MBTS_ID', [ ses(), g.mbts_id ]); - g.error.sdump('D_DEBUG',g.error.pretty_print( js2JSON(mp_list) )); + //g.error.sdump('D_DEBUG',g.error.pretty_print( js2JSON(mp_list) )); var mp_funcs = []; diff --git a/Open-ILS/xul/staff_client/server/patron/util.js b/Open-ILS/xul/staff_client/server/patron/util.js index 1898e7ad56..4aca244036 100644 --- a/Open-ILS/xul/staff_client/server/patron/util.js +++ b/Open-ILS/xul/staff_client/server/patron/util.js @@ -173,36 +173,36 @@ patron.util.mp_columns = function(modify,params) { var c = [ { - 'persist' : 'hidden width ordinal', 'id' : 'id', 'label' : 'ID', 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'mp_id', 'label' : 'ID', 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : 'my.mp.id()' }, { - 'persist' : 'hidden width ordinal', 'id' : 'amount', 'label' : 'Amount', 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'mp_amount', 'label' : 'Amount', 'flex' : 1, 'primary' : false, 'hidden' : false, 'render' : 'util.money.sanitize( my.mp.amount() )', 'sort_type' : 'money', }, { - 'persist' : 'hidden width ordinal', 'id' : 'payment_type', 'label' : 'Type', 'flex' : 1, - 'primary' : false, 'hidden' : false, 'render' : 'try { alert(js2JSON(my.mp)); my.mp.payment_type(); } catch(E) { alert(E + "\n" + js2JSON(my.mp)); }' + 'persist' : 'hidden width ordinal', 'id' : 'mp_payment_type', 'label' : 'Type', 'flex' : 1, + 'primary' : false, 'hidden' : false, 'render' : 'my.mp.payment_type()' }, { - 'persist' : 'hidden width ordinal', 'id' : 'payment_ts', 'label' : 'When', 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'mp_payment_ts', 'label' : 'When', 'flex' : 1, 'primary' : false, 'hidden' : false, 'render' : 'util.date.formatted_date( my.mp.payment_ts(), "" )' }, { - 'persist' : 'hidden width ordinal', 'id' : 'note', 'label' : 'Note', 'flex' : 2, + 'persist' : 'hidden width ordinal', 'id' : 'mp_note', 'label' : 'Note', 'flex' : 2, 'primary' : false, 'hidden' : false, 'render' : 'my.mp.note()' }, { - 'persist' : 'hidden width ordinal', 'id' : 'note', 'label' : 'Workstation', 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'mp_ws', 'label' : 'Workstation', 'flex' : 1, 'primary' : false, 'hidden' : false, 'render' : 'my.mp.cash_drawer().name()' }, { - 'persist' : 'hidden width ordinal', 'id' : 'note', 'label' : 'Staff', 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'mp_staff', 'label' : 'Staff', 'flex' : 1, 'primary' : false, 'hidden' : false, 'render' : 'JSAN.use("patron.util"); var s = my.mp.accepting_usr(); if (s && typeof s != "object") s = patron.util.retrieve_fleshed_au_via_id(ses(),s); s.card().barcode() + " @ " + obj.OpenILS.data.hash.aou[ s.home_ou() ].shortname();' }, { - 'persist' : 'hidden width ordinal', 'id' : 'xact', 'label' : 'Transaction ID', 'flex' : 1, + 'persist' : 'hidden width ordinal', 'id' : 'mp_xact', 'label' : 'Transaction ID', 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : 'my.mp.xact()' }, ]; -- 2.11.0