[open-ils-commits] r14421 - in branches/rel_1_6/Open-ILS/xul/staff_client: chrome/content/OpenILS server/patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-10-14 15:45:57 -0400 (Wed, 14 Oct 2009)
New Revision: 14421

Modified:
   branches/rel_1_6/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
   branches/rel_1_6/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
Log:
backport changeset 14111: fixes doubled holds display glitch from oils_persist

Modified: branches/rel_1_6/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
===================================================================
--- branches/rel_1_6/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js	2009-10-14 19:32:45 UTC (rev 14420)
+++ branches/rel_1_6/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js	2009-10-14 19:45:57 UTC (rev 14421)
@@ -50,9 +50,16 @@
                     if (value) nodes[i].setAttribute( attribute_list[j], value );
                 }
                 if (nodes[i].nodeName == 'checkbox' && attribute_list.indexOf('checked') > -1) {
-                    var evt = document.createEvent("Events");
-                    evt.initEvent( 'command', true, true );
-                    nodes[i].dispatchEvent(evt);
+                    if (nodes[i].disabled == false && nodes[i].hidden == false) {
+                        var no_poke = nodes[i].getAttribute('oils_persist_no_poke');
+                        if (no_poke && no_poke == 'true') {
+                            // Timing issue for some checkboxes; don't poke them with an event
+                        } else {
+                            var evt = document.createEvent("Events");
+                            evt.initEvent( 'command', true, true );
+                            nodes[i].dispatchEvent(evt);
+                        }
+                    }
                     nodes[i].addEventListener(
                         'command',
                         function(bk) {

Modified: branches/rel_1_6/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul
===================================================================
--- branches/rel_1_6/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul	2009-10-14 19:32:45 UTC (rev 14420)
+++ branches/rel_1_6/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul	2009-10-14 19:45:57 UTC (rev 14421)
@@ -58,7 +58,7 @@
 
 <hbox id="holds_top_ui" flex="1">
     <button id="place_hold_btn" hidden="true" label="&staff.patron.holds_overlay.place_hold.label;" accesskey="&staff.patron.holds_overlay.place_hold.accesskey;" command="cmd_search_opac" />
-    <checkbox id="lib_filter_checkbox" oils_persist="checked" checked="true" hidden="true" label="&staff.patron.holds_overlay.lib_filter_checkbox.label;"/>
+    <checkbox id="lib_filter_checkbox" oils_persist="checked" oils_persist_no_poke="true" checked="true" hidden="true" label="&staff.patron.holds_overlay.lib_filter_checkbox.label;"/>
     <menulist id="lib_type_menu" hidden="true" oils_persist="value">
         <menupopup>
             <menuitem id="pickup_lib" value="pickup_lib" label="&staff.patron.holds_overlay.pickup_lib.label;"/>