From 22a8120544d954eadc8750c3cbbf7085deb4982b Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Wed, 1 Feb 2012 15:20:58 -0500 Subject: [PATCH] Receipt editor and %bill_id% This fixes pop-up errors when viewing the bill_payment template in rel_2_1. We're trying to call .replace on a number instead of a string with the sample data provided. I think this should be forward-ported to master as defensive code. Signed-off-by: Jason Etheridge Conflicts: Open-ILS/xul/staff_client/chrome/content/util/print.js --- Open-ILS/xul/staff_client/chrome/content/util/print.js | 5 +++++ 1 file changed, 5 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 6ea3a54848..091322f568 100644 --- a/Open-ILS/xul/staff_client/chrome/content/util/print.js +++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js @@ -96,8 +96,13 @@ util.print.prototype = { }, 'escape_html' : function(data) { +<<<<<<< HEAD if (typeof data == 'null') { return ''; } return data.replace(/&/g,'&').replace(//g,'>'); +======= + if (typeof data == 'object') { return ''; } + return String(data).replace(/&/g,'&').replace(//g,'>'); +>>>>>>> 0d795bf... Receipt editor and %bill_id% }, 'simple' : function(msg,params) { -- 2.11.0