Bug 32030: Add document to license - Preparation step

[koha-ffzg.git] / Koha / Libraries.pm

diff --git a/Koha/Libraries.pm b/Koha/Libraries.pm
index 927368e..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
 
@@ -46,33 +47,19 @@ sub search_filtered {
     my ( $self, $params, $attributes ) = @_;
 
     my @branchcodes;
-    if ( my $userenv = C4::Context->userenv ) {
-        if ( C4::Context::only_my_library ) {
-            push @branchcodes, $userenv->{branch};
-        }
-        else {
+    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} );
-            unless (
-                $logged_in_user->can(
-                    { borrowers => 'view_borrower_infos_from_any_libraries' }
-                )
-              )
-            {
-                if ( my $library_groups = $logged_in_user->library->library_groups )
-                {
-                    while ( my $library_group = $library_groups->next ) {
-                        push @branchcodes,
-                          $library_group->parent->children->get_column('branchcode');
-                    }
-                }
-                else {
-                    push @branchcodes, $userenv->{branch};
-                }
+            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};
             }
         }
     }
-
-    $params->{branchcode} = { -in => \@branchcodes } if @branchcodes;
     delete $params->{only_from_group};
     return $self->SUPER::search( $params, $attributes );
 }