From e6e0d39039c856fa6a298798787dfa2fa7015810 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Mon, 22 Feb 2016 18:15:53 -0500
Subject: [PATCH] KPAC - Hold results not displaying item title and throwing
 log error

I believe the path comparison operator in the 'load' subroutine has
a flaw in logic caused by a path-naming problem. The path-matching
function recognizes the kpac/getit_results path as matching positively
for both the load_getit subroutine and the load_getit_results subroutine.

This patch reverses the order in which the matching occurs in an attempt
to resolve the conflict.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm | 4 +---
 Open-ILS/src/templates/kpac/getit_results.tt2         | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
index fc200e5a7c..feeda796e0 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
@@ -35,15 +35,13 @@ sub load {
     #  Everything below here requires SSL
     # ----------------------------------------------------------------
     return $self->redirect_ssl unless $self->cgi->https;
-
-    return $self->load_getit_results if $path =~ m|kpac/getit_results|;
     return $self->load_getit if $path =~ m|kpac/getit|;
 
     # ----------------------------------------------------------------
     #  Everything below here requires authentication
     # ----------------------------------------------------------------
     return $self->redirect_auth unless $self->editor->requestor;
-
+    return $self->load_getit_results if $path =~ m|kpac/getit_results|;
     # AUTH pages
 
     return Apache2::Const::OK;
diff --git a/Open-ILS/src/templates/kpac/getit_results.tt2 b/Open-ILS/src/templates/kpac/getit_results.tt2
index 18b12ea2cd..4d7de3be73 100644
--- a/Open-ILS/src/templates/kpac/getit_results.tt2
+++ b/Open-ILS/src/templates/kpac/getit_results.tt2
@@ -29,7 +29,7 @@
         <h2 class="sub_header2">[% l('Hold Successful!') %]</h2>
         <p>
         [% l('Your request for [_1] was successful.', '<a href="' _ mkurl(ctx.kpac_root _ '/record/' _ ctx.bre_id, {}, kill_params) _ '">' _ title_html _ '</a>') %]<br/>
-        [% l('You will be notified when your item is ready for pickup.  You will be able to pick your item up at [_1].', lib_html) %]
+        [% l('You will be notified when your item is ready for pickup.') %]
         <p>
     [% ELSE %]
         <p>
-- 
2.11.0