Bug 32336: (QA follow-up) Use $metadata->schema

[srvgit] / Koha / Libraries.pm

diff --git a/Koha/Libraries.pm b/Koha/Libraries.pm
index fa2bf17..20ceb8a 100644 (file)
--- a/Koha/Libraries.pm
+++ b/Koha/Libraries.pm
@@ -4,27 +4,30 @@ package Koha::Libraries;
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
 
-use Carp;
 
 use C4::Context;
 
+use Koha::Biblios;
 use Koha::Database;
+use Koha::Item::Transfer::Limits;
+use Koha::Items;
 use Koha::Library;
+use Koha::Patrons;
 
 use base qw(Koha::Objects);
 
@@ -34,9 +37,7 @@ Koha::Libraries - Koha Library Object set class
 
 =head1 API
 
-=head2 Class Methods
-
-=cut
+=head2 Class methods
 
 =head3 search_filtered
 
@@ -45,10 +46,21 @@ Koha::Libraries - Koha Library Object set class
 sub search_filtered {
     my ( $self, $params, $attributes ) = @_;
 
-    if ( C4::Context::only_my_library ) {
-        $params->{branchcode} = C4::Context->userenv->{branch};
+    my @branchcodes;
+    my $userenv = C4::Context->userenv;
+    if ( $userenv and $userenv->{number} ) {
+        my $only_from_group = $params->{only_from_group};
+        if ( $only_from_group ) {
+            my $logged_in_user = Koha::Patrons->find( $userenv->{number} );
+            my @branchcodes = $logged_in_user->libraries_where_can_see_patrons;
+            $params->{branchcode} = { -in => \@branchcodes } if @branchcodes;
+        } else {
+            if ( C4::Context::only_my_library ) {
+                $params->{branchcode} = C4::Context->userenv->{branch};
+            }
+        }
     }
-
+    delete $params->{only_from_group};
     return $self->SUPER::search( $params, $attributes );
 }