This patch removes changes in two cases to work around the fact that
Koha::Database and C4::Context were not using the same DBI database
handle.
To test:
[1] Run prove -v t/db_dependent/ILSDI_Services.t and
prove -v t/db_dependent/Items.t. Both tests
should fail.
[2] Apply the main patches and run step 1 again. This
time, both tests should pass.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
my %data = (
firstname => 'my firstname',
surname => 'my surname',
my %data = (
firstname => 'my firstname',
surname => 'my surname',
branchcode => 'UT',
cardnumber => 'ilsdi-cardnumber',
userid => 'ilsdi-userid',
branchcode => 'UT',
cardnumber => 'ilsdi-cardnumber',
userid => 'ilsdi-userid',
);
# Crate patron category
);
# Crate patron category
-unless ( GetBorrowercategory('PT') ) {
+unless ( GetBorrowercategory('UT') ) {
$dbh->do("INSERT INTO categories
(categorycode,description,enrolmentperiod,upperagelimit,enrolmentfee,overduenoticerequired,reservefee,category_type,default_privacy)
VALUES
$dbh->do("INSERT INTO categories
(categorycode,description,enrolmentperiod,upperagelimit,enrolmentfee,overduenoticerequired,reservefee,category_type,default_privacy)
VALUES
- ('PT','Unit tester',99,99,0.000000,1,0.000000,'C','default');");
+ ('UT','Unit tester',99,99,0.000000,1,0.000000,'C','default');");
my $biblioitem = $biblio->biblioitem();
my ( $item ) = $biblioitem->items();
my $biblioitem = $biblio->biblioitem();
my ( $item ) = $biblioitem->items();
- $schema->resultset('Systempreference')->update_or_create({ variable => 'item-level_itypes', value => 0 });
+ C4::Context->set_preference( 'item-level_itypes', 0 );
ok( $item->effective_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' );
- $schema->resultset('Systempreference')->update_or_create({ variable => 'item-level_itypes', value => 1 });
+ C4::Context->set_preference( 'item-level_itypes', 1 );
ok( $item->effective_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' );