From 62f4385e96af33907e979e62016af0c9a665bd60 Mon Sep 17 00:00:00 2001 From: phasefx Date: Mon, 17 Jul 2006 16:16:39 +0000 Subject: [PATCH] drop modal for bill history/current so we can print them git-svn-id: svn://svn.open-ils.org/ILS/trunk@5040 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/patron/bill_history.xul | 7 ++++--- Open-ILS/xul/staff_client/server/patron/bills.js | 16 ++++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/patron/bill_history.xul b/Open-ILS/xul/staff_client/server/patron/bill_history.xul index 9d860d8a2d..ccc91e96c4 100644 --- a/Open-ILS/xul/staff_client/server/patron/bill_history.xul +++ b/Open-ILS/xul/staff_client/server/patron/bill_history.xul @@ -211,7 +211,7 @@ JSAN.use('util.money'); JSAN.use('patron.util'); JSAN.use('OpenILS.data'); g.data = new OpenILS.data(); g.data.init({'via':'stash'}); - g.data.temp = ''; g.data.stash('temp'); + //g.data.temp = ''; g.data.stash('temp'); g.error.sdump('D_TRACE','my_init() for bill_history.xul'); @@ -266,7 +266,8 @@ ); g.bill_list.clear(); retrieve_mbts_for_list(); - g.data.temp = 'refresh'; g.data.stash('temp'); + //g.data.temp = 'refresh'; g.data.stash('temp'); + if (typeof window.refresh == 'function') window.refresh(); } } @@ -296,7 +297,7 @@ 'footer' : g.data.print_list_templates[template].footer, 'type' : g.data.print_list_templates[template].type, 'list' : g.bill_list.dump_with_keys(), - 'modal' : true, + //'modal' : true, }; JSAN.use('util.print'); var print = new util.print(); print.tree_list( params ); diff --git a/Open-ILS/xul/staff_client/server/patron/bills.js b/Open-ILS/xul/staff_client/server/patron/bills.js index dca0160d0b..404671921f 100644 --- a/Open-ILS/xul/staff_client/server/patron/bills.js +++ b/Open-ILS/xul/staff_client/server/patron/bills.js @@ -168,14 +168,16 @@ patron.bills.prototype = { try { JSAN.use('util.window'); var win = new util.window(); - obj.OpenILS.data.init({'via':'stash'}); obj.OpenILS.data.temp = ''; obj.OpenILS.data.stash('temp'); + //obj.OpenILS.data.init({'via':'stash'}); obj.OpenILS.data.temp = ''; obj.OpenILS.data.stash('temp'); var w = win.open( urls.XUL_PATRON_BILL_HISTORY + '?patron_id=' + window.escape(obj.patron_id), 'billhistory', - 'chrome,resizable,modal' + //'chrome,resizable,modal' + 'chrome,resizable' ); - obj.OpenILS.data.init({'via':'stash'}); if (obj.OpenILS.data.temp == 'refresh') { obj.refresh(); } + //obj.OpenILS.data.init({'via':'stash'}); if (obj.OpenILS.data.temp == 'refresh') { obj.refresh(); } + w.refresh = function() { obj.refresh(); }; } catch(E) { obj.error.standard_unexpected_error_alert('bills -> cmd_bill_history',E); } @@ -187,14 +189,16 @@ patron.bills.prototype = { try { JSAN.use('util.window'); var win = new util.window(); - obj.OpenILS.data.init({'via':'stash'}); obj.OpenILS.data.temp = ''; obj.OpenILS.data.stash('temp'); + //obj.OpenILS.data.init({'via':'stash'}); obj.OpenILS.data.temp = ''; obj.OpenILS.data.stash('temp'); var w = win.open( urls.XUL_PATRON_BILL_HISTORY + '?current=1&patron_id=' + window.escape(obj.patron_id), 'billhistory', - 'chrome,resizable,modal' + //'chrome,resizable,modal' + 'chrome,resizable' ); - obj.OpenILS.data.init({'via':'stash'}); if (obj.OpenILS.data.temp == 'refresh') { obj.refresh(); } + //obj.OpenILS.data.init({'via':'stash'}); if (obj.OpenILS.data.temp == 'refresh') { obj.refresh(); } + w.refresh = function() { obj.refresh(); }; } catch(E) { obj.error.standard_unexpected_error_alert('bills -> cmd_alternate_view',E); } -- 2.11.0