Bug 17600: Standardize our EXPORT_OK

[srvgit] / Koha / ItemTypes.pm

diff --git a/Koha/ItemTypes.pm b/Koha/ItemTypes.pm
index e0f9ad3..13caa64 100644 (file)
--- a/Koha/ItemTypes.pm
+++ b/Koha/ItemTypes.pm
@@ -2,29 +2,28 @@ package Koha::ItemTypes;
 
 # 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::Languages;
 
 use Koha::Database;
 use Koha::ItemType;
 
-use base qw(Koha::Objects);
+use base qw(Koha::Objects Koha::Objects::Limit::Library);
 
 =head1 NAME
 
@@ -32,7 +31,7 @@ Koha::ItemTypes - Koha ItemType Object set class
 
 =head1 API
 
-=head2 Class Methods
+=head2 Class methods
 
 =cut
 
@@ -56,48 +55,14 @@ sub search_with_localization {
         }
     ];
     if(defined $params->{branchcode}) {
-        $self->search_with_library_limits( $params, $attributes );
+        my $branchcode = delete $params->{branchcode};
+        $self->search_with_library_limits( $params, $attributes, $branchcode );
     } else {
         $self->SUPER::search( $params, $attributes );
     }
 }
 
-=head3 search_with_library_limits
-
-search itemtypes by library
-
-my @itemtypes = Koha::ItemTypes->search_with_library_limits({branchcode => branchcode});
-
-=cut
-
-sub search_with_library_limits {
-    my ( $self, $params, $attributes ) = @_;
-
-    my $branchcode = $params->{branchcode};
-    delete( $params->{branchcode} );
-
-    return $self->SUPER::search( $params, $attributes ) unless $branchcode;
-
-    my $where = {
-        '-or' => [
-            'itemtypes_branches.branchcode' => undef,
-            'itemtypes_branches.branchcode' => $branchcode
-        ]
-    };
-
-    $attributes //= {};
-    if(exists $attributes->{join}) {
-        if(ref $attributes->{join} eq 'ARRAY') {
-            push @{$attributes->{join}}, 'itemtypes_branches';
-        } else {
-            $attributes->{join} = [ $attributes->{join}, 'itemtypes_branches' ];
-        }
-    } else {
-        $attributes->{join} = 'itemtypes_branches';
-    }
-
-    return $self->SUPER::search( { %$params, %$where, }, $attributes );
-}
+=head2 Internal methods
 
 =head3 type