LP#1978839 Holds Pull List - Library Shortnames

Display shortnames instead of IDs for the Requesting Library
and Selection Library columns in the Pull List grid in the
staff client.

Test:
1. Circulation->Pull List for Hold Requests
2. Select OU with holds to pull or place an item hold on an
   available item and select the owning OU
3. Add the Requesting Library and Selection Library columns
   (note IDs are displayed)
5. Apply patch, rebuild Angular, rebuild Perl
6. Refresh and re-add columns (note shortnames are displayed)

Signed-off-by: Dan Briem <dbriem@wlsmail.org>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
index 5dde2e3..99d5e3e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
@@ -220,10 +220,10 @@
       <eg-grid-column i18n-label label="Hold Target" path='target' [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Fulfilling Staff" path='fulfillment_staff' [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Fulfilling Library" path='fulfillment_lib' [hidden]="true"></eg-grid-column>
-      <eg-grid-column i18n-label label="Requesting Library" path='request_lib' [hidden]="true"></eg-grid-column>
+      <eg-grid-column i18n-label label="Requesting Library" path='rl_shortname' [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Requesting User" path='requestor' [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="User" path='usr' [hidden]="true"></eg-grid-column>
-      <eg-grid-column i18n-label label="Selection Library" path='selection_ou' [hidden]="true"></eg-grid-column>
+      <eg-grid-column i18n-label label="Selection Library" path='sl_shortname' [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Item Selection Depth" path='selection_depth' [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Holdable Formats (for M-type hold)" path='holdable_formats' [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Notifications Phone Number" path='phone_notify' [hidden]="true"></eg-grid-column>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index 3a4359b..ed5e337 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -2230,6 +2230,10 @@ SELECT  h.id, h.request_time, h.capture_time, h.fulfillment_time, h.checkin_time
         pl.shortname AS pl_shortname, pl.name AS pl_name, pl.email AS pl_email,
         pl.phone AS pl_phone, pl.opac_visible AS pl_opac_visible, pl.fiscal_calendar AS pl_fiscal_calendar,
 
+        rl.shortname AS rl_shortname,
+
+        sl.shortname AS sl_shortname,
+
         tr.id AS tr_id, tr.source_send_time AS tr_source_send_time, tr.dest_recv_time AS tr_dest_recv_time,
         tr.target_copy AS tr_target_copy, tr.source AS tr_source, tr.dest AS tr_dest, tr.prev_hop AS tr_prev_hop,
         tr.copy_status AS tr_copy_status, tr.persistant_transfer AS tr_persistant_transfer,
@@ -2374,6 +2378,8 @@ SELECT  h.id, h.request_time, h.capture_time, h.fulfillment_time, h.checkin_time
         JOIN actor.usr ru ON (ru.id = h.requestor)
         JOIN actor.card ruc ON (ruc.id = ru.card)
         JOIN actor.org_unit pl ON (h.pickup_lib = pl.id)
+        JOIN actor.org_unit rl ON (h.request_lib = rl.id)
+        JOIN actor.org_unit sl ON (h.selection_ou = sl.id)
         JOIN t_field ON TRUE
         JOIN a_field ON TRUE
         LEFT JOIN action.hold_request_cancel_cause cc ON (h.cancel_cause = cc.id)