Bug 16889: Remove C4::Items::biblioitems_columns and use Koha::Biblioitems->columns instead

Test plan:
Add new rule to the "Automatic item modifications by age" tools
(tools/automatic_item_modification_by_age.pl) and make sure the columns
of the biblioitems table are correctly displayed in the 'Conditions'
dropdown list.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2016-07-09 14:37:46 +01:00 committed by Kyle M Hall
parent e6aa7d65da
commit dc78583de1
2 changed files with 4 additions and 16 deletions

View File

@ -37,6 +37,7 @@ use Data::Dumper; # used as part of logging item record changes, not just for
use Koha::DateUtils qw/dt_from_string/;
use Koha::Database;
use Koha::Biblioitems;
use Koha::Items;
use Koha::SearchEngine;
use Koha::SearchEngine::Search;
@ -3046,20 +3047,6 @@ sub PrepareItemrecordDisplay {
};
}
=head2 biblioitems_columns
my @columns = C4::Items::biblioitems_columns();
Returns an array of biblioitems' table columns on success,
and an empty array on failure.
=cut
sub biblioitems_columns {
my $rs = Koha::Database->new->schema->resultset('Biblioitem');
return $rs->result_source->columns;
}
sub ToggleNewStatus {
my ( $params ) = @_;
my @rules = @{ $params->{rules} };
@ -3068,7 +3055,7 @@ sub ToggleNewStatus {
my $dbh = C4::Context->dbh;
my @errors;
my @item_columns = map { "items.$_" } Koha::Items->columns;
my @biblioitem_columns = map { "biblioitems.$_" } C4::Items::biblioitems_columns;
my @biblioitem_columns = map { "biblioitems.$_" } Koha::Biblioitems->columns;
my $report;
for my $rule ( @rules ) {
my $age = $rule->{age};

View File

@ -41,6 +41,7 @@ use C4::Output;
use C4::Koha;
use Koha::Items;
use Koha::Biblioitems;
my $cgi = new CGI;
@ -109,7 +110,7 @@ if ( $@ ) {
}
my @item_fields = map { "items.$_" } Koha::Items->columns;
my @biblioitem_fields = map { "biblioitems.$_" } C4::Items::biblioitems_columns;
my @biblioitem_fields = map { "biblioitems.$_" } Koha::Biblioitems->columns;
$template->param(
op => $op,
messages => \@messages,