Consolidate some checkboxes into a Checkin Modifiers menu button, since we'll be...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@14218 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 629fbef..40f9156 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1795,6 +1795,8 @@
 <!ENTITY staff.circ.checkin_overlay.do_not_alert_on_precat.label "Ignore Pre-cataloged Items">
 <!ENTITY staff.circ.checkin_overlay.checkin_auto.label "Auto-Print Hold and Transit Slips">
 <!ENTITY staff.circ.checkin_overlay.checkin_auto.accesskey "P">
+<!ENTITY staff.circ.checkin_overlay.checkin_modifiers_btn.label "Checkin Modifiers">
+<!ENTITY staff.circ.checkin_overlay.checkin_modifiers_btn.accesskey "M">
 <!ENTITY staff.circ.renew_overlay.background_text "Renew Item">
 <!ENTITY staff.circ.renew_overlay.sel_clip.label "Copy to Clipboard">
 <!ENTITY staff.circ.renew_overlay.sel_clip.accesskey "C">

diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.js b/Open-ILS/xul/staff_client/server/circ/checkin.js
index 2ac9d2c..4e435d0 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkin.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.js
@@ -313,7 +313,7 @@ circ.checkin.prototype = {
                        }
                        var backdate = obj.controller.view.checkin_effective_datepicker.value;
                        var auto_print = document.getElementById('checkin_auto');
-                       if (auto_print) auto_print = auto_print.checked;
+                       if (auto_print) auto_print = auto_print.getAttribute('checked') == 'true';
                        JSAN.use('circ.util');
                        circ.util.checkin_via_barcode(
                                ses(), 

diff --git a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
index 9cf7b33..cb5b5a9 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
@@ -124,9 +124,16 @@
                accesskey="&staff.checkin.print_receipt.accesskey;"/>
        <checkbox id="trim_list" label="&staff.circ.checkin_overlay.trim_list.label;" checked="true" oils_persist="checked"/> 
        <checkbox id="strict_barcode" label="&staff.circ.checkin_overlay.strict_barcode.label;" checked="false" oils_persist="checked"/> 
-       <checkbox id="do_not_alert_on_precat" label="&staff.circ.checkin_overlay.do_not_alert_on_precat.label;" oils_persist="checked"/> 
        <spacer id="pcii3s" flex="1"/>
-       <checkbox id="checkin_auto" label="&staff.circ.checkin_overlay.checkin_auto.label;" accesskey="&staff.circ.checkin_overlay.checkin_auto.accesskey;" oils_persist="checked"/> 
+    <button id="checkin_modifiers" oncommand="this.firstChild.showPopup();"
+        label="&staff.circ.checkin_overlay.checkin_modifiers_btn.label;"
+        accesskey="&staff.circ.checkin_overlay.checkin_modifiers_btn.accesskey;"
+        type="menu" allowevents="true">
+        <menupopup id="checkin_modifiers_popup">
+            <menuitem type="checkbox" id="do_not_alert_on_precat" label="&staff.circ.checkin_overlay.do_not_alert_on_precat.label;" oils_persist="checked"/> 
+            <menuitem type="checkbox" id="checkin_auto" label="&staff.circ.checkin_overlay.checkin_auto.label;" accesskey="&staff.circ.checkin_overlay.checkin_auto.accesskey;" oils_persist="checked"/> 
+        </menupopup>
+    </button>
 </hbox>
 
 </overlay>

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index dc5c677..5491278 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -2493,7 +2493,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                     print_data.route_to;
                                        if (document.getElementById('do_not_alert_on_precat')) {
                                                var x = document.getElementById('do_not_alert_on_precat');
-                                               if (! x.checked) {
+                                               if (x.getAttribute('checked') != 'true') {
                                                        print_data.route_to_msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
                             msg += print_data.route_to_msg;
                                                }