From a0dbaf8896b4a19085a322bb8677ad510e9750bf Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Mon, 25 Feb 2013 10:12:11 -0500 Subject: [PATCH] re-adding STAFF_MIDDLENAME, PATRON_MIDDLENAME, PATRON_EXPIRE_DATE, and PATRON_EXPIRE_DATE_YMD to rel_2_3_4 Conflicts: Open-ILS/xul/staff_client/chrome/content/util/print.js --- Open-ILS/xul/staff_client/chrome/content/util/print.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 075b0c1201..319316ab7c 100644 --- a/Open-ILS/xul/staff_client/chrome/content/util/print.js +++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js @@ -366,7 +366,8 @@ util.print.prototype = { catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');} try{b = s; s = s.replace(/%PATRON_EXPIRE_DATE_YMD%/g,util.date.formatted_date(params.patron.expire_date(), '%Y-%m-%d'));} catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');} - + try{b = s; s = s.replace(/%PATRON_EXPIRE_DATE_YMD%/g,util.date.formatted_date(this.escape_html(params.patron.expire_date()), '%Y-%m-%d'));} + catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');} try{b = s; s=s.replace(/%TODAY%/g,(new Date()));} catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');} try{b = s; s=s.replace(/%TODAY_m%/g,(util.date.formatted_date(new Date(),'%m')));} -- 2.11.0