From bbdf45070302269d838bee3bbe1c9ddfbac0f924 Mon Sep 17 00:00:00 2001 From: phasefx Date: Mon, 22 Sep 2008 03:51:01 +0000 Subject: [PATCH] toward standardizing some list actions git-svn-id: svn://svn.open-ils.org/ILS/trunk@10669 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/locale/en-US/lang.dtd | 12 +++++++ .../staff_client/server/circ/copy_status.js | 35 ++----------------- .../staff_client/server/circ/copy_status.xul | 7 ++-- .../server/circ/copy_status_overlay.xul | 17 +++++++-- 4 files changed, 32 insertions(+), 39 deletions(-) diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index 16461ccfec..10018c8ba1 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -2410,6 +2410,18 @@ + + + + + + + + + + + + diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.js b/Open-ILS/xul/staff_client/server/circ/copy_status.js index a8cfa56692..69dd353f3a 100644 --- a/Open-ILS/xul/staff_client/server/circ/copy_status.js +++ b/Open-ILS/xul/staff_client/server/circ/copy_status.js @@ -328,38 +328,9 @@ circ.copy_status.prototype = { } } ], - 'cmd_copy_status_export' : [ - ['command'], - function() { - try { - obj.list.dump_csv_to_clipboard(); - } catch(E) { - obj.error.standard_unexpected_error_alert('export',E); - } - } - ], - 'cmd_copy_status_print_export' : [ - ['command'], - function() { - try { - obj.list.on_all_fleshed = - function() { - try { - dump( obj.list.dump_csv() + '\n' ); - //copy_to_clipboard(obj.list.dump_csv()); - JSAN.use('util.print'); var print = new util.print(); - print.simple(obj.list.dump_csv(),{'content_type':'text/plain'}); - setTimeout(function(){ obj.list.on_all_fleshed = null; },0); - } catch(E) { - obj.error.standard_unexpected_error_alert('export',E); - } - }; - obj.list.full_retrieve(); - } catch(E) { - obj.error.standard_unexpected_error_alert('export',E); - } - } - ], + 'cmd_csv_to_clipboard' : [ ['command'], function() { obj.list.dump_csv_to_clipboard(); } ], + 'cmd_csv_to_printer' : [ ['command'], function() { obj.list.dump_csv_to_printer(); } ], + 'cmd_csv_to_file' : [ ['command'], function() { obj.list.dump_csv_to_file( { 'defaultFileName' : 'item_status.txt' } ); } ], 'cmd_add_items' : [ ['command'], diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.xul b/Open-ILS/xul/staff_client/server/circ/copy_status.xul index 872f6ef21e..c99818d566 100644 --- a/Open-ILS/xul/staff_client/server/circ/copy_status.xul +++ b/Open-ILS/xul/staff_client/server/circ/copy_status.xul @@ -102,10 +102,9 @@ - - - - + + + diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul b/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul index ae46bf4bbb..5ba8b01a4f 100644 --- a/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul +++ b/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul @@ -166,10 +166,21 @@ + +