@@ -, +, @@ --- C4/Auth.pm | 3 --- Koha/Template/Plugin/Desks.pm | 16 ++++++++++++++++ koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 10 +++++----- 3 files changed, 21 insertions(+), 8 deletions(-) --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -462,7 +462,6 @@ sub get_template_and_user { OpenLibraryCovers => C4::Context->preference("OpenLibraryCovers"), KohaAdminEmailAddress => "" . C4::Context->preference("KohaAdminEmailAddress"), LoginBranchcode => ( C4::Context->userenv ? C4::Context->userenv->{"branch"} : undef ), - LoginDeskname => ( C4::Context->userenv ? C4::Context->userenv->{"desk_name"} : undef ), LoginFirstname => ( C4::Context->userenv ? C4::Context->userenv->{"firstname"} : "Bel" ), LoginSurname => C4::Context->userenv ? C4::Context->userenv->{"surname"} : "Inconnu", emailaddress => C4::Context->userenv ? C4::Context->userenv->{"emailaddress"} : undef, @@ -491,7 +490,6 @@ sub get_template_and_user { IntranetmainUserblock => C4::Context->preference("IntranetmainUserblock"), LibraryName => C4::Context->preference("LibraryName"), LoginBranchname => ( C4::Context->userenv ? C4::Context->userenv->{"branchname"} : undef ), - LoginDeskname => ( C4::Context->userenv ? C4::Context->userenv->{"desk_name"} : undef ), advancedMARCEditor => C4::Context->preference("advancedMARCEditor"), canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'), intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), @@ -560,7 +558,6 @@ sub get_template_and_user { LibraryName => "" . C4::Context->preference("LibraryName"), LibraryNameTitle => "" . $LibraryNameTitle, LoginBranchname => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "", - LoginDeskname => C4::Context->userenv ? C4::Context->userenv->{"desk_name"} : "", OPACAmazonCoverImages => C4::Context->preference("OPACAmazonCoverImages"), OPACFRBRizeEditions => C4::Context->preference("OPACFRBRizeEditions"), OpacHighlightedWords => C4::Context->preference("OpacHighlightedWords"), --- a/Koha/Template/Plugin/Desks.pm +++ a/Koha/Template/Plugin/Desks.pm @@ -67,6 +67,22 @@ sub GetLoggedInDeskId { ''; } +=head3 GetLoggedInDeskName + +[% Desks.GetLoggedInDeskName %] + +Return the desk name that is attached to the session or empty string + +=cut + +sub GetLoggedInDeskName { + my ($self) = @_; + + return C4::Context->userenv ? + C4::Context->userenv->{'desk_name'} : + ''; +} + =head3 all [% Desks.all %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -89,10 +89,10 @@ [% IF (Desks.defined) %] | - [% IF ( LoginDeskname == '') %] + [% IF ( Desks.GetLoggedInDeskName == '' ) %] NO DESK SET [% ELSE %] - [% LoginDeskname | html %] + [% Desks.GetLoggedInDeskName | html %] [% Desks.GetLoggedInDeskId | html %] [% END %] @@ -119,10 +119,10 @@
  • Desk:
    - [% IF ( LoginDeskname == '' AND Desks.defined ) %] + [% IF ( Desks.GetLoggedInDeskName == '' AND Desks.defined ) %] NO DESK SET - [% ELSIF ( LoginDeskname != '' ) %] - [% LoginDeskname | html %] + [% ELSIF ( Desks.GetLoggedInDeskName != '' ) %] + [% Desks.GetLoggedInDeskName | html %] [% Desks.GetLoggedInDeskId | html %] [% END %]
  • --