From c97b4ddb75823e4f5df14ec74a9d1ead95bc9c06 Mon Sep 17 00:00:00 2001
From: Kathy Lussier <klussier@masslnc.org>
Date: Wed, 21 Feb 2018 15:19:34 -0500
Subject: [PATCH] LP#1661688: Add a link and other tweaks to alternate hold
 pickup feature

Adding a couple of tweaks to the alternate hold pickup feature:
  * Created a link for the hold patron so that staff can easily retrieve the record and potentially verify that the user allows the alternate patron to pick
up their holds.
  * Tweaked the language in the event dialog.
  * Removed the new OU setting from actor.org_unit_setting so that a default value is not set.

Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 Open-ILS/src/extras/ils_events.xml                        | 2 +-
 .../perlmods/lib/OpenILS/Application/Circ/Circulate.pm    | 1 +
 Open-ILS/src/sql/Pg/950.data.seed-values.sql              | 8 --------
 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.hold_checkout.sql | 8 --------
 .../staff/circ/share/t_event_override_dialog.tt2          | 4 ++--
 Open-ILS/web/js/ui/default/staff/circ/services/circ.js    | 1 +
 6 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/Open-ILS/src/extras/ils_events.xml b/Open-ILS/src/extras/ils_events.xml
index a4573b41bb..473b2d65dd 100644
--- a/Open-ILS/src/extras/ils_events.xml
+++ b/Open-ILS/src/extras/ils_events.xml
@@ -892,7 +892,7 @@
 		<desc xml:lang="en-US">This requested action would result in a negative patron balance</desc>
 	</event>
 	<event code='7016' textcode='ITEM_ON_HOLDS_SHELF'>
-		<desc xml:lang="en-US">This item is currently on the holds shelf for another patron</desc>
+		<desc xml:lang="en-US">This item is currently on the holds shelf for another patron:</desc>
 	</event>
 	<event code='7017' textcode='ROUTE_TO_COPY_LOCATION'>
 		<desc xml:lang="en-US"> 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
index caed8bb7e4..deb9541e32 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -1135,6 +1135,7 @@ sub check_captured_holds {
 
         if ($holdau) {
             $payload->{patron_name} = $holdau->first_given_name . ' ' . $holdau->family_name;
+            $payload->{patron_id} = $holdau->id;
         } else {
             $payload->{patron_name} = "???";
         }
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 65f3a70cdd..f6c7d19a93 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -16739,14 +16739,6 @@ VALUES
      		'coust', 'description'),
    	'bool');
 
-INSERT INTO actor.org_unit_setting (
-    org_unit, name, value
-) VALUES (
-    (SELECT id FROM actor.org_unit WHERE parent_ou IS NULL),
-    'circ.clear_hold_on_checkout',
-    'false'
-);
-
 INSERT INTO config.org_unit_setting_type
 ( name, grp, label, description, datatype )
 VALUES
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.hold_checkout.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.hold_checkout.sql
index db792232c7..fa7b41d97a 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.hold_checkout.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.hold_checkout.sql
@@ -15,13 +15,5 @@ VALUES
      		'coust', 'description'),
    	'bool');
 
-INSERT INTO actor.org_unit_setting (
-    org_unit, name, value
-) VALUES (
-    (SELECT id FROM actor.org_unit WHERE parent_ou IS NULL),
-    'circ.clear_hold_on_checkout',
-    'false'
-);
-
 COMMIT;
 
diff --git a/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2
index 0adeb115cc..398796f20c 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2
@@ -13,8 +13,8 @@
         <div class="panel-body">
           <div ng-if="copy_barcode" class="strong-text-2">{{copy_barcode}}</div>
           {{evt.desc}}
-          <div ng-if="evt.textcode == 'ITEM_ON_HOLDS_SHELF'">
-	      [% l('for ') %] {{patronName}}.
+          <div ng-if="evt.textcode == 'ITEM_ON_HOLDS_SHELF'"> 
+	       <a target="_blank" href="[% ctx.base_path %]/staff/circ/patron/{{patronID}}/checkout">{{patronName}}</a>.
             <div>
 		<label><input type="checkbox" ng-model="formdata.clearHold"/> 
 		[% l('Cancel this hold upon checkout?') %]</label>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 3bf866cde2..d2a72f03ed 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -752,6 +752,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,  egAddCopyAl
 
                    $scope.patronName = $scope.holdEvent.payload.patron_name;
                    $scope.holdID = $scope.holdEvent.payload.hold_id;
+                   $scope.patronID = $scope.holdEvent.payload.patron_id;
                 }
 
                 $scope.auto_override =
-- 
2.43.2