[open-ils-commits] r11802 - in trunk/Open-ILS/xul/staff_client/server: circ locale/en-US

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-01-12 15:40:53 -0500 (Mon, 12 Jan 2009)
New Revision: 11802

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/util.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Log:
support patron alias in hold/transit slip, and fix a bug where patron name was not printing

Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-01-12 18:06:59 UTC (rev 11801)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-01-12 20:40:53 UTC (rev 11802)
@@ -2047,7 +2047,11 @@
 						msg += '\n';
 						var au_obj = patron.util.retrieve_fleshed_au_via_id( session, check.payload.hold.usr() );
 						msg += '\n';
-						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron',  [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
+                        if (au_obj.alias()) {
+    						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron_alias',  [au_obj.alias()]);
+                        } else {
+    						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron',  [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
+                        }
 						msg += '\n';
 						msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [au_obj.card().barcode()]);
 						msg += '\n';
@@ -2177,7 +2181,11 @@
 				JSAN.use('patron.util');
 				var au_obj = patron.util.retrieve_fleshed_au_via_id( session, check.payload.hold.usr() );
 				msg += '\n';
-				document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron', [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
+                if (au_obj.alias()) {
+                    msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron_alias',  [au_obj.alias()]);
+                } else {
+    				msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron', [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
+                }
 				msg += '\n';
 				msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [au_obj.card().barcode()]);
 				msg += '\n';

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2009-01-12 18:06:59 UTC (rev 11801)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2009-01-12 20:40:53 UTC (rev 11802)
@@ -290,6 +290,7 @@
 staff.circ.utils.payload.hold.title=Title: %1$s
 # Hold for patron familyName, firstName secondName
 staff.circ.utils.payload.hold.patron=Hold for patron %1$s, %2$s %3$s
+staff.circ.utils.payload.hold.patron_alias=Hold for patron %1$s
 staff.circ.utils.payload.hold.phone_notify=Notify by phone: %1$s
 staff.circ.utils.payload.hold.email_notify=Notify by email: %1$s
 staff.circ.utils.payload.hold.request_date=Request Date: %1$s