Attachment #107669 for bug #24201

View | Details | Raw Unified | Return to bug 24201
Collapse All | Expand All




        GoogleJackets                                                      => C4::Context->preference("GoogleJackets"),
        OpenLibraryCovers                                                  => C4::Context->preference("OpenLibraryCovers"),
        KohaAdminEmailAddress                                              => "" . C4::Context->preference("KohaAdminEmailAddress"),
        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,

            IntranetNav                                                                => C4::Context->preference("IntranetNav"),
            IntranetmainUserblock                                                      => C4::Context->preference("IntranetmainUserblock"),
            LibraryName                                                                => C4::Context->preference("LibraryName"),
            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"),

            opac_name                             => $opac_name,
            LibraryName                           => "" . C4::Context->preference("LibraryName"),
            LibraryNameTitle                      => "" . $LibraryNameTitle,
            LoginDeskname                         => C4::Context->userenv ? C4::Context->userenv->{"desk_name"} : "",
            OPACAmazonCoverImages                 => C4::Context->preference("OPACAmazonCoverImages"),
            OPACFRBRizeEditions                   => C4::Context->preference("OPACFRBRizeEditions"),
            OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"),




        '';
}

=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 %]




                        [% IF (Desks.defined) %]
                            <span class="separator">|</span>
                            <strong>
                                [% IF ( Desks.GetLoggedInDeskName == '' ) %]
                                   <span class="logged-in-desk-name">NO DESK SET</span>
                                [% ELSE %]
                                    <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span>
                                    <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span>
                                [% END %]
                            </strong>

                    </li>
                    <li class="loggedin-menu-label">
                        Desk: <br />
                        [% IF ( Desks.GetLoggedInDeskName == '' AND Desks.defined ) %]
                           <span class="logged-in-desk-name">NO DESK SET</span>
                        [% ELSIF ( Desks.GetLoggedInDeskName != '' ) %]
                            <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span>
                            <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span>
                        [% END %]
                    </li>
- 

Return to bug 24201

Lines 67-72 sub GetLoggedInDeskId { Link Here

(-)a/Koha/Template/Plugin/Desks.pm (+16 lines)
67	'';	67	'';
68	}	68	}
69		69
		70	=head3 GetLoggedInDeskName
		71
		72	[% Desks.GetLoggedInDeskName %]
		73
		74	Return the desk name that is attached to the session or empty string
		75
		76	=cut
		77
		78	sub GetLoggedInDeskName {
		79	my ($self) = @_;
		80
		81	return C4::Context->userenv ?
		82	C4::Context->userenv->{'desk_name'} :
		83	'';
		84	}
		85
70	=head3 all	86	=head3 all
71		87
72	[% Desks.all %]	88	[% Desks.all %]

Lines 89-98 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-6 / +5 lines)
89	[% IF (Desks.defined) %]	89	[% IF (Desks.defined) %]
90	<span class="separator">\|</span>	90	<span class="separator">\|</span>
91	<strong>	91	<strong>
92	[% IF ( LoginDeskname == '') %]	92	[% IF ( Desks.GetLoggedInDeskName == '' ) %]
93	<span class="logged-in-desk-name">NO DESK SET</span>	93	<span class="logged-in-desk-name">NO DESK SET</span>
94	[% ELSE %]	94	[% ELSE %]
95	<span class="logged-in-desk-name">[% LoginDeskname \| html %]</span>	95	<span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName \| html %]</span>
96	<span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId \| html %]</span>	96	<span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId \| html %]</span>
97	[% END %]	97	[% END %]
98	</strong>	98	</strong>
Lines 119-128 Link Here
119	</li>	119	</li>
120	<li class="loggedin-menu-label">	120	<li class="loggedin-menu-label">
121	Desk: <br />	121	Desk: <br />
122	[% IF ( LoginDeskname == '' AND Desks.defined ) %]	122	[% IF ( Desks.GetLoggedInDeskName == '' AND Desks.defined ) %]
123	<span class="logged-in-desk-name">NO DESK SET</span>	123	<span class="logged-in-desk-name">NO DESK SET</span>
124	[% ELSIF ( LoginDeskname != '' ) %]	124	[% ELSIF ( Desks.GetLoggedInDeskName != '' ) %]
125	<span class="logged-in-desk-name">[% LoginDeskname \| html %]</span>	125	<span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName \| html %]</span>
126	<span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId \| html %]</span>	126	<span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId \| html %]</span>
127	[% END %]	127	[% END %]
128	</li>	128	</li>
129	-

Lines 463-469 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (-3 lines)
463	GoogleJackets => C4::Context->preference("GoogleJackets"),	463	GoogleJackets => C4::Context->preference("GoogleJackets"),
464	OpenLibraryCovers => C4::Context->preference("OpenLibraryCovers"),	464	OpenLibraryCovers => C4::Context->preference("OpenLibraryCovers"),
465	KohaAdminEmailAddress => "" . C4::Context->preference("KohaAdminEmailAddress"),	465	KohaAdminEmailAddress => "" . C4::Context->preference("KohaAdminEmailAddress"),
466	LoginDeskname => ( C4::Context->userenv ? C4::Context->userenv->{"desk_name"} : undef ),
467	LoginFirstname => ( C4::Context->userenv ? C4::Context->userenv->{"firstname"} : "Bel" ),	466	LoginFirstname => ( C4::Context->userenv ? C4::Context->userenv->{"firstname"} : "Bel" ),
468	LoginSurname => C4::Context->userenv ? C4::Context->userenv->{"surname"} : "Inconnu",	467	LoginSurname => C4::Context->userenv ? C4::Context->userenv->{"surname"} : "Inconnu",
469	emailaddress => C4::Context->userenv ? C4::Context->userenv->{"emailaddress"} : undef,	468	emailaddress => C4::Context->userenv ? C4::Context->userenv->{"emailaddress"} : undef,
Lines 491-497 sub get_template_and_user { Link Here
491	IntranetNav => C4::Context->preference("IntranetNav"),	490	IntranetNav => C4::Context->preference("IntranetNav"),
492	IntranetmainUserblock => C4::Context->preference("IntranetmainUserblock"),	491	IntranetmainUserblock => C4::Context->preference("IntranetmainUserblock"),
493	LibraryName => C4::Context->preference("LibraryName"),	492	LibraryName => C4::Context->preference("LibraryName"),
494	LoginDeskname => ( C4::Context->userenv ? C4::Context->userenv->{"desk_name"} : undef ),
495	advancedMARCEditor => C4::Context->preference("advancedMARCEditor"),	493	advancedMARCEditor => C4::Context->preference("advancedMARCEditor"),
496	canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'),	494	canreservefromotherbranches => C4::Context->preference('canreservefromotherbranches'),
497	intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),	495	intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
Lines 559-565 sub get_template_and_user { Link Here
559	opac_name => $opac_name,	557	opac_name => $opac_name,
560	LibraryName => "" . C4::Context->preference("LibraryName"),	558	LibraryName => "" . C4::Context->preference("LibraryName"),
561	LibraryNameTitle => "" . $LibraryNameTitle,	559	LibraryNameTitle => "" . $LibraryNameTitle,
562	LoginDeskname => C4::Context->userenv ? C4::Context->userenv->{"desk_name"} : "",
563	OPACAmazonCoverImages => C4::Context->preference("OPACAmazonCoverImages"),	560	OPACAmazonCoverImages => C4::Context->preference("OPACAmazonCoverImages"),
564	OPACFRBRizeEditions => C4::Context->preference("OPACFRBRizeEditions"),	561	OPACFRBRizeEditions => C4::Context->preference("OPACFRBRizeEditions"),
565	OpacHighlightedWords => C4::Context->preference("OpacHighlightedWords"),	562	OpacHighlightedWords => C4::Context->preference("OpacHighlightedWords"),