LP#1728147 Add patron's first/last name and Alias column

This was missing from the Holds Pull grid.
Amend: check usr vs requestor instead to determine staff-hold
Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
index d705c5c..6eb569c 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_pull_list.tt2
@@ -100,6 +100,9 @@
       {{item.patron_barcode}}
     </a>
   </eg-grid-field>
+  <eg-grid-field label="[% l('Patron alias') %]" path="patron_alias" hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Patron First') %]" path="patron_first" hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Patron Last') %]" path="patron_last" hidden></eg-grid-field>
   <eg-grid-field name="pickup_lib_name" path="pickup_lib.name" 
     hidden label="[% l('Pickup Library') %]"></eg-grid-field>
   <eg-grid-field name="pickup_lib_shortname" path="pickup_lib.shortname" 

diff --git a/Open-ILS/web/js/ui/default/staff/circ/holds/app.js b/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
index 6884502..33fc77a 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/holds/app.js
@@ -319,7 +319,7 @@ function($scope , $q , $routeParams , $window , $location , egCore ,
             // check if this is a staff-created hold
             // i.e requestor's profile != 2 (patron)
 
-            item['_is_staff_hold'] = item.hold.requestor().profile != 2;
+            item['_is_staff_hold'] = item.hold.requestor().id() != item.hold.usr().id();
 
         });
     }