[open-ils-commits] r10439 - in branches/rel_1_2_3/Open-ILS/xul/staff_client: chrome/content/util server/circ

[svn at svn.open-ils.org]

Author: phasefx
Date: 2008-08-25 12:44:37 -0400 (Mon, 25 Aug 2008)
New Revision: 10439

Modified:
   branches/rel_1_2_3/Open-ILS/xul/staff_client/chrome/content/util/print.js
   branches/rel_1_2_3/Open-ILS/xul/staff_client/server/circ/util.js
Log:
extra patron macro for all receipts fed a patron object, and Current Copy Location for hold lists

Modified: branches/rel_1_2_3/Open-ILS/xul/staff_client/chrome/content/util/print.js
===================================================================
--- branches/rel_1_2_3/Open-ILS/xul/staff_client/chrome/content/util/print.js	2008-08-25 16:08:41 UTC (rev 10438)
+++ branches/rel_1_2_3/Open-ILS/xul/staff_client/chrome/content/util/print.js	2008-08-25 16:44:37 UTC (rev 10439)
@@ -166,6 +166,8 @@
 			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
 		try{b = s; s = s.replace(/%PATRON_FIRSTNAME%/,params.patron.first_given_name());}
 			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+		try{b = s; s = s.replace(/%PATRON_MIDDLENAME%/,params.patron.second_given_name());}
+			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
 		try{b = s; s = s.replace(/%PATRON_LASTNAME%/,params.patron.family_name());}
 			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
 		try{b = s; s = s.replace(/%PATRON_BARCODE%/,typeof params.patron.card() == 'object' ? params.patron.card().barcode() : util.functional.find_id_object_in_list( params.patron.cards(), params.patron.card() ).barcode() ) ;}

Modified: branches/rel_1_2_3/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- branches/rel_1_2_3/Open-ILS/xul/staff_client/server/circ/util.js	2008-08-25 16:08:41 UTC (rev 10438)
+++ branches/rel_1_2_3/Open-ILS/xul/staff_client/server/circ/util.js	2008-08-25 16:44:37 UTC (rev 10439)
@@ -782,6 +782,11 @@
 			'primary' : false, 'hidden' : true,  'render' : function(my) { return my.acp ? my.acp.barcode() : "No Copy"; },
 		},
 		{
+			'id' : 'current_copy_location', 'label' : 'Current Copy Location', 'flex' : 1,
+			'primary' : false, 'hidden' : true, 'render' : function(my) { if (!my.acp) { return ""; } else { if (Number(my.acp.location())>=0) return data.lookup("acpl", my.acp.location() ).name(); else return my.acp.location().name(); } },
+			'persist' : 'hidden width ordinal',
+		},
+		{
 			'persist' : 'hidden width ordinal', 'id' : 'email_notify', 'label' : getString('staff.ahr_email_notify_label'), 'flex' : 1,
 			'primary' : false, 'hidden' : true,  'render' : function(my) { return get_bool(my.ahr.email_notify()) ? "Yes" : "No"; },
 		},