Bug 11518: (follow-up) Change method name from 'itemtype' to 'effective_itemtype...

Test runs without errors.

Signed-off-by: Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm
index 656de69..6a1e0d2 100644 (file)
--- a/Koha/Schema/Result/Item.pm
+++ b/Koha/Schema/Result/Item.pm
@@ -625,7 +625,7 @@ __PACKAGE__->belongs_to(
 );
 
 use C4::Context;
-sub itemtype {
+sub effective_itemtype {
     my ( $self ) = @_;
 
     if ( C4::Context->preference('item-level_itypes') ) {

diff --git a/t/db_dependent/Items.t b/t/db_dependent/Items.t
index a4bdd1c..af7b252 100755 (executable)
--- a/t/db_dependent/Items.t
+++ b/t/db_dependent/Items.t
@@ -170,10 +170,10 @@ subtest q{Test Koha::Database->schema()->resultset('Item')->itemtype()} => sub {
     my ( $item ) = $biblioitem->items();
 
     C4::Context->set_preference( 'item-level_itypes', 0 );
-    ok( $item->itemtype() eq 'BIB_LEVEL', '$item->itemtype() returns biblioitem.itemtype when item-level_itypes is disabled' );
+    ok( $item->effective_itemtype() eq 'BIB_LEVEL', '$item->itemtype() returns biblioitem.itemtype when item-level_itypes is disabled' );
 
     C4::Context->set_preference( 'item-level_itypes', 1 );
-    ok( $item->itemtype() eq 'ITEM_LEVEL', '$item->itemtype() returns items.itype when item-level_itypes is disabled' );
+    ok( $item->effective_itemtype() eq 'ITEM_LEVEL', '$item->itemtype() returns items.itype when item-level_itypes is disabled' );
 
 
     $dbh->rollback;