merge r17896-17897 from trunk for printing fixes

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

diff --git a/Open-ILS/xul/staff_client/chrome/content/util/print.js b/Open-ILS/xul/staff_client/chrome/content/util/print.js
index 87e1618..3f9e884 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/util/print.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js
@@ -16,6 +16,10 @@ util.print = function (context) {
     var prefs = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces['nsIPrefBranch']);
     var key = 'oils.printer.external.cmd.' + this.context;
     var has_key = prefs.prefHasUserValue(key);
+    if(!has_key && this.context != 'default') {
+        key = 'oils.printer.external.cmd.default';
+        has_key = prefs.prefHasUserValue(key);
+    }
     this.oils_printer_external_cmd = has_key ? prefs.getCharPref(key) : '';
 
     return this;

diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.js b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
index f1d9263..8c32d41 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/spine_labels.js
+++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.js
@@ -580,6 +580,7 @@
             w.xulG = { 
                 'url' : 'about:blank',
                 'show_print_button' : 1,
+                'printer_context' : 'label',
                 'alternate_print' : 1,
                 'no_xulG' : 1,
                 'title' : $("catStrings").getString('staff.cat.spine_labels.preview.title'),
@@ -609,6 +610,7 @@
                     'url' : 'data:text/html;charset=utf-8,'+window.escape(html),
                     'html_source' : html,
                     'show_print_button' : 1,
+                    'printer_context' : 'label',
                     'no_xulG' : 1
                 }
             );