Browse Source

Bug 15758: Koha::Libraries - Move mybranch to C4::Context

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
16.11.x
Jonathan Druart 7 years ago
committed by Kyle M Hall
parent
commit
79f4afe26a
  1. 9
      C4/Branch.pm
  2. 4
      C4/Circulation.pm
  3. 4
      admin/branch_transfer_limits.pl
  4. 4
      admin/smart-rules.pl
  5. 4
      t/db_dependent/Branch.t
  6. 2
      tools/letter.pl
  7. 2
      tools/overduerules.pl

9
C4/Branch.pm

@ -29,9 +29,8 @@ BEGIN {
@EXPORT = qw(
&GetBranch
&GetBranches
&mybranch
);
@EXPORT_OK = qw( &onlymine &mybranch );
@EXPORT_OK = qw( &onlymine );
}
=head1 NAME
@ -126,12 +125,6 @@ sub onlymine {
&& C4::Context->userenv->{branch};
}
# always returns a string for OK comparison via "eq" or "ne"
sub mybranch {
C4::Context->userenv or return '';
return C4::Context->userenv->{branch} || '';
}
=head2 GetBranch
$branch = GetBranch( $query, $branches );

4
C4/Circulation.pm

@ -170,7 +170,7 @@ System Pref options.
#
sub barcodedecode {
my ($barcode, $filter) = @_;
my $branch = C4::Branch::mybranch();
my $branch = C4::Context::mybranch();
$filter = C4::Context->preference('itemBarcodeInputFilter') unless $filter;
$filter or return $barcode; # ensure filter is defined, else return untouched barcode
if ($filter eq 'whitespace') {
@ -3141,7 +3141,7 @@ sub GetIssuingCharges {
if ( my $item_data = $sth->fetchrow_hashref ) {
$item_type = $item_data->{itemtype};
$charge = $item_data->{rentalcharge};
my $branch = C4::Branch::mybranch();
my $branch = C4::Context::mybranch();
my $discount_query = q|SELECT rentaldiscount,
issuingrules.itemtype, issuingrules.branchcode
FROM borrowers

4
admin/branch_transfer_limits.pl

@ -41,9 +41,9 @@ my ($template, $loggedinuser, $cookie)
my $dbh = C4::Context->dbh;
my $branchcode;
if((!defined($input->param('branchcode'))) & mybranch() ne '')
if((!defined($input->param('branchcode'))) & C4::Context::mybranch() ne '')
{
$branchcode = mybranch();
$branchcode = C4::Context::mybranch();
}
else
{

4
admin/smart-rules.pl

@ -55,10 +55,10 @@ my $type=$input->param('type');
my $branch = $input->param('branch');
unless ( $branch ) {
if ( C4::Context->preference('DefaultToLoggedInLibraryCircRules') ) {
$branch = Koha::Libraries->search->count() == 1 ? undef : C4::Branch::mybranch();
$branch = Koha::Libraries->search->count() == 1 ? undef : C4::Context::mybranch();
}
else {
$branch = C4::Branch::onlymine() ? ( C4::Branch::mybranch() || '*' ) : '*';
$branch = C4::Branch::onlymine() ? ( C4::Context::mybranch() || '*' ) : '*';
}
}
$branch = '*' if $branch eq 'NO_LIBRARY_SET';

4
t/db_dependent/Branch.t

@ -38,7 +38,6 @@ can_ok(
'C4::Branch', qw(
GetBranch
GetBranches
mybranch
)
);
@ -194,7 +193,4 @@ is_deeply( $b2info->get_categories->count, 1, 'BRB has the category CAT1' );
Koha::LibraryCategory->new($cat2)->store;
is( Koha::LibraryCategories->search->count, $count_cat + 3, "Two categories added" );
#TODO later: test mybranchine and onlymine
# Actually we cannot mock C4::Context->userenv in unit tests
$schema->storage->txn_rollback;

2
tools/letter.pl

@ -358,7 +358,7 @@ sub default_display {
unless ( defined $branchcode ) {
if ( C4::Context->preference('DefaultToLoggedInLibraryNoticesSlips') ) {
$branchcode = C4::Branch::mybranch();
$branchcode = C4::Context::mybranch();
}
}

2
tools/overduerules.pl

@ -74,7 +74,7 @@ my $type = $input->param('type');
my $branch = $input->param('branch');
$branch =
defined $branch ? $branch
: C4::Context->preference('DefaultToLoggedInLibraryOverdueTriggers') ? C4::Branch::mybranch()
: C4::Context->preference('DefaultToLoggedInLibraryOverdueTriggers') ? C4::Context::mybranch()
: Koha::Libraries->search->count() == 1 ? undef
: undef;
$branch ||= q{};

Loading…
Cancel
Save