From 956f68b144aeaed1ef0b1f93cdf4b2a67d996f7c Mon Sep 17 00:00:00 2001 From: phasefx Date: Wed, 22 Sep 2010 20:03:09 +0000 Subject: [PATCH] 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 --- Open-ILS/xul/staff_client/chrome/content/util/print.js | 4 ++++ Open-ILS/xul/staff_client/server/cat/spine_labels.js | 2 ++ 2 files changed, 6 insertions(+) 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 87e161852e..3f9e884b66 100644 --- 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 f1d926349f..8c32d41ea4 100644 --- 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 } ); -- 2.11.0