LP#1402797 Add usr and requestor columns to the hold pull list

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>

diff --git a/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2 b/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
index e47f713..598d86e 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/holds/t_shelf_list.tt2
@@ -79,6 +79,8 @@
   <eg-grid-field label="[% l('Status') %]" path='status_string'></eg-grid-field>
 
   <eg-grid-field label="[% l('Queue Position') %]" path='queue_position' hidden></eg-grid-field>
+  <eg-grid-field path='hold.usr.*' parent-idl-class="ahr" hidden></eg-grid-field>
+  <eg-grid-field path='hold.requestor.*' parent-idl-class="ahr" hidden></eg-grid-field>
   <eg-grid-field path='hold.*' parent-idl-class="ahr" hidden></eg-grid-field>
   <eg-grid-field path='copy.*' parent-idl-class="acp" hidden></eg-grid-field>
   <eg-grid-field path='volume.*' parent-idl-class="acn" hidden></eg-grid-field>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
index ee2fa79..b155085 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
@@ -6,8 +6,8 @@ angular.module('egCoreMod')
 
 .factory('egHolds',
 
-       ['$modal','$q','egCore','egUser','egConfirmDialog','egAlertDialog',
-function($modal , $q , egCore , egUser , egConfirmDialog , egAlertDialog) {
+       ['$modal','$q','egCore','egConfirmDialog','egAlertDialog',
+function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
 
     var service = {};
 
@@ -410,10 +410,10 @@ function($modal , $q , egCore , egUser , egConfirmDialog , egAlertDialog) {
         hold_data.id = hold.id();
 
         if (hold.requestor() && typeof hold.requestor() != 'object')
-            hold.requestor(egUser.get(hold.requestor()));
+            egCore.pcrud.retrieve('au',hold.requestor()).then(function(u) { hold.requestor(u) });
 
         if (hold.usr() && typeof hold.usr() != 'object')
-            hold.usr(egUser.get(hold.usr()));
+            egCore.pcrud.retrieve('au',hold.usr()).then(function(u) { hold.usr(u) });
 
         // current_copy is not always fleshed in the API
         if (hold.current_copy() && typeof hold.current_copy() != 'object')