gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 15758: Koha::Libraries - Move onlymine to C4::Context::only_my_library 

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2016-02-05 12:30:29 +00:00 committed by Kyle M Hall
parent df97814f30
commit 6b95cb48b3
7 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
C4/Branch.pm
View File

@ -48,14 +48,6 @@ The functions in this module deal with branches.
=cut
sub onlymine {
return
C4::Context->preference('IndependentBranches')
&& C4::Context->userenv
&& !C4::Context->IsSuperLibrarian()
&& C4::Context->userenv->{branch};
}
=head2 GetBranch
$branch = GetBranch( $query, $branches );

9
C4/Context.pm
View File

@ -1035,6 +1035,15 @@ sub mybranch {
C4::Context->userenv or return '';
return C4::Context->userenv->{branch} || '';
}
sub only_my_library {
return
C4::Context->preference('IndependentBranches')
&& C4::Context->userenv
&& !C4::Context->IsSuperLibrarian()
&& C4::Context->userenv->{branch};
}
1;
__END__

2
C4/Utils/DataTables/Members.pm
View File

@ -25,7 +25,7 @@ sub search {
# If branches are independent and user is not superlibrarian
# The search has to be only on the user branch
if ( C4::Branch::onlymine ) {
if ( C4::Context::only_my_library ) {
my $userenv = C4::Context->userenv;
$branchcode = $userenv->{'branch'};

6
Koha/Libraries.pm
View File

@ -45,11 +45,7 @@ Koha::Libraries - Koha Library Object set class
sub search_filtered {
my ( $self, $params, $attributes ) = @_;
if ( C4::Context->preference('IndependentBranches')
and C4::Context->userenv
and not C4::Context->IsSuperLibrarian()
and C4::Context->userenv->{branch}
) {
if ( C4::Context::only_my_library ) {
$params->{branchcode} = C4::Context->userenv->{branch};
}

2
admin/smart-rules.pl
View File

@ -58,7 +58,7 @@ unless ( $branch ) {
$branch = Koha::Libraries->search->count() == 1 ? undef : C4::Context::mybranch();
}
else {
$branch = C4::Branch::onlymine() ? ( C4::Context::mybranch() || '*' ) : '*';
$branch = C4::Context::only_my_library() ? ( C4::Context::mybranch() || '*' ) : '*';
}
}
$branch = '*' if $branch eq 'NO_LIBRARY_SET';

7
circ/overdue.pl
View File

@ -89,13 +89,6 @@ while (my ($itemtype, $description) =$req->fetchrow) {
itemtypename => $description,
};
}
my $onlymine =
C4::Context->preference('IndependentBranches')
&& C4::Context->userenv
&& !C4::Context->IsSuperLibrarian()
&& C4::Context->userenv->{branch};
$branchfilter = C4::Context->userenv->{'branch'} if ($onlymine && !$branchfilter);
# Filtering by Patron Attributes
# @patron_attr_filter_loop is non empty if there are any patron attribute filters

2
members/member.pl
View File

@ -49,7 +49,7 @@ my $quicksearch = $input->param('quicksearch') // 0;
if ( $quicksearch and $searchmember ) {
my $branchcode;
if ( C4::Branch::onlymine ) {
if ( C4::Context::only_my_library ) {
my $userenv = C4::Context->userenv;
$branchcode = $userenv->{'branch'};
}