From a450d3bb841c1674532e18e9e0e6a2ee49de0cbd Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 21 Jul 2020 15:58:02 +0100 Subject: [PATCH] Bug 25765: (QA follow-up) Save a DB hit Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 83d63d2302ee77c68dbae8be80fc6a038fa5ce51) Signed-off-by: Lucas Gass --- Koha/Template/Plugin/Branches.pm | 3 +-- t/db_dependent/Template/Plugin/Branches.t | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Koha/Template/Plugin/Branches.pm b/Koha/Template/Plugin/Branches.pm index 51a2df93a3..05932dac68 100644 --- a/Koha/Template/Plugin/Branches.pm +++ b/Koha/Template/Plugin/Branches.pm @@ -43,8 +43,7 @@ sub GetLoggedInBranchcode { sub GetLoggedInBranchname { my ($self) = @_; - my $code = $self->GetLoggedInBranchcode; - return $code ? $self->GetName($code) : q{}; + return C4::Context->userenv ? C4::Context->userenv->{'branchname'} : q{}; } sub GetURL { diff --git a/t/db_dependent/Template/Plugin/Branches.t b/t/db_dependent/Template/Plugin/Branches.t index 17a41b7fe6..f6141d9345 100644 --- a/t/db_dependent/Template/Plugin/Branches.t +++ b/t/db_dependent/Template/Plugin/Branches.t @@ -71,7 +71,7 @@ subtest 'all() tests' => sub { is($plugin->GetLoggedInBranchcode(), '', 'no active library code if there is no active user session'); is($plugin->GetLoggedInBranchname(), '', 'no active library name if there is no active user session'); - t::lib::Mocks::mock_userenv({ branchcode => 'MYLIBRARY' }); + t::lib::Mocks::mock_userenv({ branchcode => 'MYLIBRARY', branchname => 'My sweet library' }); is($plugin->GetLoggedInBranchcode(), 'MYLIBRARY', 'GetLoggedInBranchcode() returns active library code'); is($plugin->GetLoggedInBranchname(), 'My sweet library', 'GetLoggedInBranchname() returns active library name'); -- 2.39.5