Attachment 53243 Details for Bug 16889 – Bug 16889: Remove C4::Items::columns and use Koha::Items->columns instead

[patch] Bug 16889: Remove C4::Items::columns and use Koha::Items->columns instead

Bug-16889-Remove-C4Itemscolumns-and-use-KohaItems-.patch (text/plain), 2.38 KB, created by Jonathan Druart on 2016-07-09 13:54:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-07-09 13:54:32 UTC

Size: 2.38 KB

patch

obsolete

>From ccdfa495058deec8fd5e45c2ded04ea3a9e3cd25 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Sat, 9 Jul 2016 14:35:02 +0100
>Subject: [PATCH] Bug 16889: Remove C4::Items::columns and use
> Koha::Items->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 items table are correctly displayed.
>---
> C4/Items.pm                                 | 18 ++----------------
> tools/automatic_item_modification_by_age.pl |  4 +++-
> 2 files changed, 5 insertions(+), 17 deletions(-)
>
>diff --git a/C4/Items.pm b/C4/Items.pm
>index c870655..0e04574 100644
>--- a/C4/Items.pm
>+++ b/C4/Items.pm
>@@ -37,7 +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::Database;
>+use Koha::Items;
> use Koha::SearchEngine;
> use Koha::SearchEngine::Search;
> 
>@@ -3046,20 +3046,6 @@ sub PrepareItemrecordDisplay {
>     };
> }
> 
>-=head2 columns
>-
>-  my @columns = C4::Items::columns();
>-
>-Returns an array of items' table columns on success,
>-and an empty array on failure.
>-
>-=cut
>-
>-sub columns {
>-    my $rs = Koha::Database->new->schema->resultset('Item');
>-    return $rs->result_source->columns;
>-}
>-
> =head2 biblioitems_columns
> 
>   my @columns = C4::Items::biblioitems_columns();
>@@ -3081,7 +3067,7 @@ sub ToggleNewStatus {
> 
>     my $dbh = C4::Context->dbh;
>     my @errors;
>-    my @item_columns = map { "items.$_" } C4::Items::columns;
>+    my @item_columns = map { "items.$_" } Koha::Items->columns;
>     my @biblioitem_columns = map { "biblioitems.$_" } C4::Items::biblioitems_columns;
>     my $report;
>     for my $rule ( @rules ) {
>diff --git a/tools/automatic_item_modification_by_age.pl b/tools/automatic_item_modification_by_age.pl
>index 82895d2..49673fc 100755
>--- a/tools/automatic_item_modification_by_age.pl
>+++ b/tools/automatic_item_modification_by_age.pl
>@@ -40,6 +40,8 @@ use C4::Items;
> use C4::Output;
> use C4::Koha;
> 
>+use Koha::Items;
>+
> my $cgi = new CGI;
> 
> # open template
>@@ -106,7 +108,7 @@ if ( $@ ) {
>     exit;
> }
> 
>-my @item_fields = map { "items.$_" } C4::Items::columns;
>+my @item_fields = map { "items.$_" } Koha::Items->columns;
> my @biblioitem_fields = map { "biblioitems.$_" } C4::Items::biblioitems_columns;
> $template->param(
>     op => $op,
>-- 
>2.8.1

Actions: View | Diff | Splinter Review

Attachments on bug 16889: 53240 | 53241 | 53243 | 53244 | 53292 | 53293 | 53294 | 53295 | 53379 | 53380 | 53381 | 53382 | 53383