Lines 35-41
use DateTime::Format::MySQL;
Link Here
|
35 |
use Data::Dumper; # used as part of logging item record changes, not just for |
35 |
use Data::Dumper; # used as part of logging item record changes, not just for |
36 |
# debugging; so please don't remove this |
36 |
# debugging; so please don't remove this |
37 |
use Koha::DateUtils qw/dt_from_string/; |
37 |
use Koha::DateUtils qw/dt_from_string/; |
38 |
use C4::SQLHelper qw(GetColumns); |
38 |
|
|
|
39 |
use Koha::Database; |
39 |
|
40 |
|
40 |
use vars qw($VERSION @ISA @EXPORT); |
41 |
use vars qw($VERSION @ISA @EXPORT); |
41 |
|
42 |
|
Lines 2634-2642
sub _SearchItems_build_where_fragment {
Link Here
|
2634 |
}; |
2635 |
}; |
2635 |
} |
2636 |
} |
2636 |
} else { |
2637 |
} else { |
2637 |
my @columns = GetColumns('items'); |
2638 |
my @columns = Koha::Database->new()->schema()->resultset('Item')->result_source->columns; |
2638 |
push @columns, GetColumns('biblio'); |
2639 |
push @columns, Koha::Database->new()->schema()->resultset('Biblio')->result_source->columns; |
2639 |
push @columns, GetColumns('biblioitems'); |
2640 |
push @columns, Koha::Database->new()->schema()->resultset('Biblioitem')->result_source->columns; |
2640 |
my @operators = qw(= != > < >= <= like); |
2641 |
my @operators = qw(= != > < >= <= like); |
2641 |
my $field = $filter->{field}; |
2642 |
my $field = $filter->{field}; |
2642 |
if ( (0 < grep /^$field$/, @columns) or (substr($field, 0, 5) eq 'marc:') ) { |
2643 |
if ( (0 < grep /^$field$/, @columns) or (substr($field, 0, 5) eq 'marc:') ) { |
Lines 2763-2771
sub SearchItems {
Link Here
|
2763 |
$query .= qq{ WHERE $where_str }; |
2764 |
$query .= qq{ WHERE $where_str }; |
2764 |
} |
2765 |
} |
2765 |
|
2766 |
|
2766 |
my @columns = GetColumns('items'); |
2767 |
my @columns = Koha::Database->new()->schema()->resultset('Item')->result_source->columns; |
2767 |
push @columns, GetColumns('biblio'); |
2768 |
push @columns, Koha::Database->new()->schema()->resultset('Biblio')->result_source->columns; |
2768 |
push @columns, GetColumns('biblioitems'); |
2769 |
push @columns, Koha::Database->new()->schema()->resultset('Biblioitem')->result_source->columns; |
2769 |
my $sortby = (0 < grep {$params->{sortby} eq $_} @columns) |
2770 |
my $sortby = (0 < grep {$params->{sortby} eq $_} @columns) |
2770 |
? $params->{sortby} : 'itemnumber'; |
2771 |
? $params->{sortby} : 'itemnumber'; |
2771 |
my $sortorder = (uc($params->{sortorder}) eq 'ASC') ? 'ASC' : 'DESC'; |
2772 |
my $sortorder = (uc($params->{sortorder}) eq 'ASC') ? 'ASC' : 'DESC'; |