gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 20469: Remove effective parameter 

Test plan:
Run test Koha/Item.t again

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Marcel de Rooy 2020-07-27 13:34:21 +00:00 committed by Jonathan Druart
parent b1235746d9
commit 5a474e50e0
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Koha/Item.pm
View File

@ -822,15 +822,15 @@ sub to_api_mapping {
=head3 itemtype
my $itemtype = $item->itemtype({ effective => 1 });
my $itemtype = $item->itemtype;
Returns Koha object for (effective) itemtype
Returns Koha object for effective itemtype
=cut
sub itemtype {
my ( $self, $params ) = @_;
return Koha::ItemTypes->find( $params->{effective} ? $self->effective_itemtype : $self->itype ); # no FK
my ( $self ) = @_;
return Koha::ItemTypes->find( $self->effective_itemtype );
}
=head2 Internal methods

8
t/db_dependent/Koha/Item.t
View File

@ -504,7 +504,7 @@ subtest 'renewal_branchcode' => sub {
};
subtest 'Tests for itemtype' => sub {
plan tests => 4;
plan tests => 2;
$schema->storage->txn_begin;
my $biblio = $builder->build_sample_biblio;
@ -512,11 +512,9 @@ subtest 'Tests for itemtype' => sub {
my $item = $builder->build_sample_item({ biblionumber => $biblio->biblionumber, itype => $itemtype->itemtype });
t::lib::Mocks::mock_preference('item-level_itypes', 1);
is( $item->itemtype({ effective => 1 })->itemtype, $item->itype, 'Pref enabled, effective parameter' );
is( $item->itemtype->itemtype, $item->itype, 'Pref enabled, no parameter' );
is( $item->itemtype->itemtype, $item->itype, 'Pref enabled' );
t::lib::Mocks::mock_preference('item-level_itypes', 0);
is( $item->itemtype({ effective => 1 })->itemtype, $biblio->biblioitem->itemtype, 'Pref disabled, effective parameter' );
is( $item->itemtype->itemtype, $item->itype, 'Pref disabled, no parameter' );
is( $item->itemtype->itemtype, $biblio->biblioitem->itemtype, 'Pref disabled' );
$schema->storage->txn_rollback;
};