From dc78583de113bb9d24e29c2ca1c7d4033951fd59 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Sat, 9 Jul 2016 14:37:46 +0100 Subject: [PATCH] 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 Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall --- C4/Items.pm | 17 ++--------------- tools/automatic_item_modification_by_age.pl | 3 ++- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index 0e04574683..81a8263a5d 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -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}; diff --git a/tools/automatic_item_modification_by_age.pl b/tools/automatic_item_modification_by_age.pl index 49673fc9fd..12a1c006e1 100755 --- a/tools/automatic_item_modification_by_age.pl +++ b/tools/automatic_item_modification_by_age.pl @@ -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, -- 2.39.5