[open-ils-commits] r20329 - in branches/rel_2_1/Open-ILS: web/opac/locale/en-US xul/staff_client/server/circ (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2011-04-26 16:44:46 -0400 (Tue, 26 Apr 2011)
New Revision: 20329

Modified:
   branches/rel_2_1/Open-ILS/web/opac/locale/en-US/lang.dtd
   branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
   branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/util.js
Log:
Hold, Transit, and Hold/Transit Slips used to suppress the printer dialog, but we lost that when we moved to templated slips.  This adds a sticky Printer Prompt checkbox to Check In for controlling that behavior.


Modified: branches/rel_2_1/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- branches/rel_2_1/Open-ILS/web/opac/locale/en-US/lang.dtd	2011-04-26 20:44:43 UTC (rev 20328)
+++ branches/rel_2_1/Open-ILS/web/opac/locale/en-US/lang.dtd	2011-04-26 20:44:46 UTC (rev 20329)
@@ -2176,6 +2176,7 @@
 <!ENTITY staff.circ.checkin_overlay.actions.label "Actions for Selected Items">
 <!ENTITY staff.circ.checkin_overlay.actions.accesskey "S">
 <!ENTITY staff.circ.checkin_overlay.checkin_export.label "Export">
+<!ENTITY staff.circ.checkin_overlay.printer_prompt.label "Printer Prompt">
 <!ENTITY staff.circ.checkin_overlay.trim_list.label "Trim List (20 rows)">
 <!ENTITY staff.circ.checkin_overlay.async_checkin.label "Fast Entry (Asynchronous)">
 <!ENTITY staff.circ.checkin_overlay.strict_barcode.label "Strict Barcode">

Modified: branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
===================================================================
--- branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul	2011-04-26 20:44:43 UTC (rev 20328)
+++ branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul	2011-04-26 20:44:46 UTC (rev 20329)
@@ -155,6 +155,7 @@
         label="&staff.checkin.print_receipt.label;" 
         command="cmd_checkin_print"
         accesskey="&staff.checkin.print_receipt.accesskey;"/>
+    <checkbox id="printer_prompt" label="&staff.circ.checkin_overlay.printer_prompt.label;" checked="true" oils_persist="checked"/>
     <checkbox id="trim_list" label="&staff.circ.checkin_overlay.trim_list.label;" checked="true" oils_persist="checked"/> 
     <checkbox id="async_checkin" label="&staff.circ.checkin_overlay.async_checkin.label;" checked="false" oils_persist="checked"/> 
     <checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 

Modified: branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/util.js	2011-04-26 20:44:43 UTC (rev 20328)
+++ branches/rel_2_1/Open-ILS/xul/staff_client/server/circ/util.js	2011-04-26 20:44:46 UTC (rev 20329)
@@ -2819,6 +2819,9 @@
                                     'list' : print_list,
                                     'data' : print_data
                                 };
+                                if ($('printer_prompt')) {
+                                    if (! $('printer_prompt').checked) { params.no_prompt = true; }
+                                }
                                 print.tree_list( params );
                             }
                         } catch(E) {
@@ -3209,6 +3212,9 @@
                             'list' : print_list,
                             'data' : print_data 
                         };
+                        if ($('printer_prompt')) {
+                            if (! $('printer_prompt').checked) { params.no_prompt = true; }
+                        }
                         print.tree_list( params );
                     }
                 } catch(E) {