From e13b401ec5f0939338b21fc56c224de7359a4fc9 Mon Sep 17 00:00:00 2001 From: Kyle Tomita Date: Tue, 26 Mar 2013 13:33:14 -0700 Subject: [PATCH] LP1109316 - Hold note count and text not displayed (rel_2_3) Ported over dwells' solution for fixing the holds blob. Signed-off-by: Kyle Tomita --- Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm index 8b206594be..95ca1f1f0c 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm @@ -3234,16 +3234,16 @@ sub uber_hold_impl { ) or return $e->event; if($hold->usr->id ne $e->requestor->id) { - # A user is allowed to see his/her own holds + # Caller is asking for someone else's holds $e->allowed('VIEW_HOLD') or return $e->event; - $hold->notes( # filter out any non-staff ("private") notes - [ grep { !$U->is_true($_->staff) } @{$hold->notes} ] ); + $hold->notes( # filter out any non-staff ("private") notes (unless marked as public) + [ grep { $U->is_true($_->staff) or $U->is_true($_->pub) } @{$hold->notes} ] ); } else { # caller is asking for own hold, but may not have permission to view staff notes unless($e->allowed('VIEW_HOLD')) { - $hold->notes( # filter out any staff notes - [ grep { $U->is_true($_->staff) } @{$hold->notes} ] ); + $hold->notes( # filter out any staff notes (unless marked as public) + [ grep { !$U->is_true($_->staff) or $U->is_true($_->pub) } @{$hold->notes} ] ); } } -- 2.11.0