[open-ils-commits] r18160 - in branches/rel_2_0/Open-ILS: src/perlmods/OpenILS/Application/Circ xul/staff_client/server/circ xul/staff_client/server/locale/en-US xul/staff_client/server/patron (senator)

[svn at svn.open-ils.org]

Author: senator
Date: 2010-10-04 15:24:07 -0400 (Mon, 04 Oct 2010)
New Revision: 18160

Modified:
   branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
   branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js
   branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
   branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/hold_details.js
   branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js
Log:
Backport r18158 from trunk: patron alias column in some holds interfaces


Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2010-10-04 19:05:59 UTC (rev 18159)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2010-10-04 19:24:07 UTC (rev 18160)
@@ -2611,6 +2611,7 @@
         patron_first   => $user->first_given_name,
         patron_last    => $user->family_name,
         patron_barcode => $card->barcode,
+        patron_alias   => $user->alias,
         %$details
     };
 }

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js	2010-10-04 19:05:59 UTC (rev 18159)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/circ/util.js	2010-10-04 19:24:07 UTC (rev 18160)
@@ -2089,6 +2089,15 @@
             'editable' : false, 'render' : function(my) { return my.patron_family_name ? my.patron_family_name : ""; }
         },
         {
+            "persist": "hidden width ordinal",
+            "id": "patron_alias",
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.patron_alias'),
+            'flex' : 1,
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) { return my.patron_alias ? my.patron_alias : ""; }
+        },
+        {
             'persist' : 'hidden width ordinal',
             'id' : 'patron_first_given_name',
             'label' : document.getElementById('circStrings').getString('staff.circ.utils.patron_first_given_name'),

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2010-10-04 19:05:59 UTC (rev 18159)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2010-10-04 19:24:07 UTC (rev 18160)
@@ -330,6 +330,7 @@
 staff.circ.utils.author.none=No Author?
 staff.circ.utils.notify_time=Last Notify Time
 staff.circ.utils.notify_count=Notices
+staff.circ.utils.patron_alias=Patron Alias
 staff.circ.utils.patron_family_name=Patron Last Name
 staff.circ.utils.patron_first_given_name=Patron First Name
 staff.circ.utils.checkin.override=Override Checkin Failure?

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/hold_details.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/hold_details.js	2010-10-04 19:05:59 UTC (rev 18159)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/hold_details.js	2010-10-04 19:24:07 UTC (rev 18160)
@@ -143,6 +143,7 @@
                         'patron_family_name' : g.blob.patron_last,
                         'patron_first_given_name' : g.blob.patron_first,
                         'patron_barcode' : g.blob.patron_barcode,
+                        'patron_alias' : g.blob.patron_alias,
                         'total_holds' : g.blob.total_holds,
                         'queue_position' : g.blob.queue_position,
                         'potential_copies' : g.blob.potential_copies,

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js	2010-10-04 19:05:59 UTC (rev 18159)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js	2010-10-04 19:24:07 UTC (rev 18160)
@@ -85,6 +85,7 @@
                                     row.my.patron_family_name = blob.patron_last;
                                     row.my.patron_first_given_name = blob.patron_first;
                                     row.my.patron_barcode = blob.patron_barcode;
+                                    row.my.patron_alias = blob.patron_alias;
                                     row.my.total_holds = blob.total_holds;
                                     row.my.queue_position = blob.queue_position;
                                     row.my.potential_copies = blob.potential_copies;