From 93081666c27c90ce301f74996da4c22457dd0a1d Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 28 May 2013 13:42:48 -0400 Subject: [PATCH] Revert "LP1182519 Per-Hold Behind Desk ML" This reverts commit 18dbf96b1ccf4f2600b45d485511391ec7714121. --- Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm index e943fbdabb..d818454d14 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm @@ -1933,7 +1933,7 @@ sub hold_request_count { } my $holds = $e->json_query({ - select => {ahr => ['pickup_lib', 'current_shelf_lib', 'behind_desk']}, + select => {ahr => ['pickup_lib', 'current_shelf_lib']}, from => 'ahr', where => { usr => $user_id, @@ -1942,15 +1942,14 @@ sub hold_request_count { } }); - my @ready = grep { - $_->{current_shelf_lib} and # avoid undef warnings - $_->{pickup_lib} eq $_->{current_shelf_lib} - } @$holds; - return { total => scalar(@$holds), - ready => scalar(@ready), - behind_desk => scalar(grep { $_->{behind_desk} eq 't' } @ready) + ready => scalar( + grep { + $_->{current_shelf_lib} and # avoid undef warnings + $_->{pickup_lib} eq $_->{current_shelf_lib} + } @$holds + ) }; } -- 2.11.0