Backport r20082 from trunk

Address LP #754880, where printing happens before the progress dialog can be
cleared in the alternate holds pull list print interface

Additionally, provide the usual "print page" button so that the list can be
reprinted at will

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

diff --git a/Open-ILS/web/opac/extras/circ/alt_holds_print.js b/Open-ILS/web/opac/extras/circ/alt_holds_print.js
index 3fd5020..31a21c1 100644 (file)
--- a/Open-ILS/web/opac/extras/circ/alt_holds_print.js
+++ b/Open-ILS/web/opac/extras/circ/alt_holds_print.js
@@ -58,10 +58,12 @@ function do_pull_list() {
           },
           oncomplete : function () {
             progress_dialog.hide();
-            if (any)
-                window.print();
-            else
-                alert(dojo.byId("no_results").innerHTML);
+            setTimeout(
+                function() {
+                    if (any) window.print();
+                    else alert(dojo.byId("no_results").innerHTML);
+                }, 500  /* give the progress_dialog more time to go away */
+            );
           }
         }
     );

diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js
index 3596a40..ba607d7 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/holds.js
+++ b/Open-ILS/xul/staff_client/server/patron/holds.js
@@ -343,7 +343,7 @@ patron.holds.prototype = {
                                     "authtime": ses("authtime"),
                                     "no_xulG": false,
                                     "show_nav_buttons": true,
-                                    "show_print_button": false
+                                    "show_print_button": true
                                 };
                                 ["url_prefix", "new_tab", "set_tab",
                                     "close_tab", "new_patron_tab",