Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 23271: Replace search_limited with search_with_library_limits

Browse source 
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2019-10-16 14:53:48 +02:00
parent 5c0c623168
commit f6e0b04f48
22 changed files with 23 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
C4/ItemCirculationAlertPreference.pm
View file

@ -331,7 +331,7 @@ sub grid {
my ($class, $where) = @_;
my @branch_prefs = $class->find($where);
my @default_prefs = $class->find({ branchcode => '*', notification => $where->{notification} });
my @cc = Koha::Patron::Categories->search_limited;
my @cc = Koha::Patron::Categories->search_with_library_limits;
my @it = Koha::ItemTypes->search;
my $notification = $where->{notification};
my %disabled = map {

13
Koha/Patron/Categories.pm
View file

@ -21,7 +21,7 @@ use Koha::Database;
use Koha::Patron::Category;
use base qw(Koha::Objects);
use base qw(Koha::Objects Koha::Objects::Limit::Library);
=head1 NAME
@ -33,17 +33,6 @@ Koha::Patron::Categories - Koha Patron Category Object set class
=cut
sub search_limited {
my ( $self, $params, $attributes ) = @_;
my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
if ( $branch_limit ) {
$params->{'categories_branches.branchcode'} = [ $branch_limit, undef ];
$attributes->{join} = 'categories_branches';
}
$attributes->{order_by} = ['description'] unless $attributes->{order_by};
return $self->search($params, $attributes);
}
=head3 type
=cut

2
Koha/Template/Plugin/Categories.pm
View file

@ -25,7 +25,7 @@ use Koha::Patron::Categories;
sub all {
my ( $self, $params ) = @_;
return Koha::Patron::Categories->search_limited($params);
return Koha::Patron::Categories->search_with_library_limits($params);
}
sub GetName {

2
acqui/add_user_search.pl
View file

@ -50,7 +50,7 @@ my $search_patrons_with_acq_perm_only =
( $referer =~ m|acqui/basket.pl| )
? 1 : 0;
my $patron_categories = Koha::Patron::Categories->search_limited;
my $patron_categories = Koha::Patron::Categories->search_with_library_limits;
$template->param(
patrons_with_acq_perm_only => $search_patrons_with_acq_perm_only,
view => ( $input->request_method() eq "GET" ) ? "show_form" : "show_results",

2
admin/add_user_search.pl
View file

@ -51,7 +51,7 @@ my $search_patrons_with_acq_perm_only =
( $referer =~ m|admin/aqbudgets.pl| )
? 1 : 0;
my $patron_categories = Koha::Patron::Categories->search_limited;
my $patron_categories = Koha::Patron::Categories->search_with_library_limits;
$template->param(
patrons_with_acq_perm_only => $search_patrons_with_acq_perm_only,
view => ( $input->request_method() eq "GET" ) ? "show_form" : "show_results",

2
admin/item_circulation_alerts.pl
View file

@ -49,7 +49,7 @@ sub show {
);
my $branch = $input->param('branch') || '*';
my @categories = Koha::Patron::Categories->search_limited;
my @categories = Koha::Patron::Categories->search_with_library_limits;
my @item_types = Koha::ItemTypes->search;
my $grid_checkout = $preferences->grid({ branchcode => $branch, notification => 'CHECKOUT' });
my $grid_checkin = $preferences->grid({ branchcode => $branch, notification => 'CHECKIN' });

2
admin/patron-attr-types.pl
View file

@ -85,7 +85,7 @@ exit 0;
sub add_attribute_type_form {
my $template = shift;
my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
my $patron_categories = Koha::Patron::Categories->search_with_library_limlits({}, {order_by => ['description']});
$template->param(
attribute_type_form => 1,
confirm_op => 'add_attribute_type_confirmed',

2
members/guarantor_search.pl
View file

@ -43,7 +43,7 @@ my $op = $input->param('op') || '';
my $referer = $input->referer();
my $patron_categories = Koha::Patron::Categories->search_limited;
my $patron_categories = Koha::Patron::Categories->search_with_library_limits;
$template->param(
view => ( $input->request_method() eq "GET" ) ? "show_form" : "show_results",
columns => ['cardnumber', 'name', 'dateofbirth', 'address', 'action' ],

2
members/memberentry.pl
View file

@ -671,7 +671,7 @@ my @typeloop;
my $no_categories = 1;
my $no_add;
foreach my $category_type (qw(C A S P I X)) {
my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => $category_type }, {order_by => ['categorycode']});
my $patron_categories = Koha::Patron::Categories->search_with_library_limits({ category_type => $category_type }, {order_by => ['categorycode']});
$no_categories = 0 if $patron_categories->count > 0;
my @categoryloop;

2
members/members-home.pl
View file

@ -44,7 +44,7 @@ if( Koha::Libraries->search->count < 1){
$template->param(no_branches => 1);
}
my @categories = Koha::Patron::Categories->search_limited;
my @categories = Koha::Patron::Categories->search_with_library_limits;
if(scalar(@categories) < 1){
$no_add = 1;
$template->param(no_categories => 1);

2
members/update-child.pl
View file

@ -57,7 +57,7 @@ my $op = $input->param('op');
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
my $patron_categories = Koha::Patron::Categories->search_with_library_limits({ category_type => 'A' }, {order_by => ['categorycode']});
if ( $op eq 'multi' ) {
# FIXME - what are the possible upgrade paths? C -> A , C -> S ...
# currently just allowing C -> A

2
patroncards/add_user_search.pl
View file

@ -43,7 +43,7 @@ my $op = $input->param('op') || '';
my $referer = $input->referer();
my $patron_categories = Koha::Patron::Categories->search_limited;
my $patron_categories = Koha::Patron::Categories->search_with_library_limits;
$template->param(
view => ( $input->request_method() eq "GET" ) ? "show_form" : "show_results",
columns => ['cardnumber', 'name', 'category', 'branch', 'dateexpiry', 'borrowernotes', 'action'],

2
reports/bor_issues_top.pl
View file

@ -108,7 +108,7 @@ my $dbh = C4::Context->dbh;
my @mime = ( map { {type =>$_} } (split /[;:]/, 'CSV') ); # FIXME translation
my $delims = GetDelimiterChoices;
my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']});
my $patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['categorycode']});
my $itemtypes = Koha::ItemTypes->search_with_localization;
$template->param(
mimeloop => \@mime,

2
reports/borrowers_out.pl
View file

@ -113,7 +113,7 @@ if ($do_it) {
my $CGIextChoice = ( 'CSV' ); # FIXME translation
my $CGIsepChoice = GetDelimiterChoices;
my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']});
my $patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['categorycode']});
$template->param(
CGIextChoice => $CGIextChoice,
CGIsepChoice => $CGIsepChoice,

2
reports/cat_issues_top.pl
View file

@ -132,7 +132,7 @@ if ($do_it) {
@shelvinglocloop = sort {$a->{value} cmp $b->{value}} @shelvinglocloop;
my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']});
my $patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['categorycode']});
$template->param(
CGIextChoice => $CGIextChoice,

2
reports/issues_stats.pl
View file

@ -88,7 +88,7 @@ $template->param(do_it => $do_it,
our $itemtypes = Koha::ItemTypes->search_with_localization->unblessed;
our @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
our @patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['description']});
our $locations = { map { ( $_->{authorised_value} => $_->{lib} ) } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.location' }, { order_by => ['description'] } ) };
our $ccodes = { map { ( $_->{authorised_value} => $_->{lib} ) } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.ccode' }, { order_by => ['description'] } ) };

4
reports/reserves_stats.pl
View file

@ -73,7 +73,7 @@ $sep = "\t" if ($sep eq 'tabulation');
$template->param(do_it => $do_it,
);
my @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
my @patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['description']});
my $locations = { map { ( $_->{authorised_value} => $_->{lib} ) } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.location' }, { order_by => ['description'] } ) };
my $ccodes = { map { ( $_->{authorised_value} => $_->{lib} ) } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.ccode' }, { order_by => ['description'] } ) };
@ -330,7 +330,7 @@ sub display_value {
}
}
elsif ( $crit =~ /category/ ) {
my @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
my @patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['description']});
foreach my $patron_category ( @patron_categories ) {
( $value eq $patron_category->categorycode ) or next;
$display_value = $patron_category->description and last;

2
serials/add_user_search.pl
View file

@ -43,7 +43,7 @@ my $op = $input->param('op') || '';
my $referer = $input->referer();
my $patron_categories = Koha::Patron::Categories->search_limited;
my $patron_categories = Koha::Patron::Categories->search_with_library_limits;
$template->param(
view => ( $input->request_method() eq "GET" ) ? "show_form" : "show_results",
columns => ['cardnumber', 'name', 'branch', 'action'],

2
t/db_dependent/Utils/Datatables_Virtualshelves.t
View file

@ -38,7 +38,7 @@ my $dbh = C4::Context->dbh;
$dbh->do(q|DELETE FROM virtualshelves|);
# Pick a categorycode from the DB
my @categories = Koha::Patron::Categories->search_limited;
my @categories = Koha::Patron::Categories->search_with_library_limits;
my $categorycode = $categories[0]->categorycode;
my $branchcode = "ABC";
my $branch_data = {

2
tools/cleanborrowers.pl
View file

@ -178,7 +178,7 @@ elsif ( $step == 3 ) {
$template->param( patron_lists => [ @non_empty_lists ] );
}
my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
my $patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['description']});
$template->param(
step => $step,

2
tools/import_borrowers.pl
View file

@ -77,7 +77,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
);
# get the patron categories and pass them to the template
my @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
my @patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['description']});
$template->param( categories => \@patron_categories );
my $columns = C4::Templates::GetColumnDefs( $input )->{borrowers};
$columns = [ grep { $_->{field} ne 'borrowernumber' ? $_ : () } @$columns ];

2
tools/modborrowers.pl
View file

@ -113,7 +113,7 @@ if ( $op eq 'show' ) {
my @patron_attributes_codes;
my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
my $patron_attribute_types = Koha::Patron::Attribute::Types->search_with_library_limits({}, {}, $library_id);
my @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
my @patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['description']});
while ( my $attr_type = $patron_attribute_types->next ) {
# TODO Repeatable attributes are not correctly managed and can cause data lost.
# This should be implemented.