From: Terran McCanna Date: Mon, 22 Feb 2016 23:15:53 +0000 (-0500) Subject: KPAC - Hold results not displaying item title and throwing log error X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=22ed379e3bcb994564ee23758037cf5b9f2fe3ea;p=evergreen%2Fpines.git 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 --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm index 5dc34147e3..0a1702d161 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm @@ -47,7 +47,7 @@ sub load { # 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 83040dc4a6..391ed2ce7e 100644 --- a/Open-ILS/src/templates/kpac/getit_results.tt2 +++ b/Open-ILS/src/templates/kpac/getit_results.tt2 @@ -29,7 +29,7 @@

[% l('Hold Successful!') %]

[% l('Your request for [_1] was successful.', '' _ title_html _ '') %]
- [% 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.') %]

[% ELSE %]