Bugzilla – Attachment 170837 Details for
Bug 37759
Duplicated "Set library" menu item caused by bad merge
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 37759: Duplicated "Set library" menu item caused by bad merge
Bug-37759-Duplicated-Set-library-menu-item-caused-.patch (text/plain), 2.45 KB, created by
Roman Dolny
on 2024-08-28 18:24:47 UTC
(
hide
)
Description:
Bug 37759: Duplicated "Set library" menu item caused by bad merge
Filename:
MIME Type:
Creator:
Roman Dolny
Created:
2024-08-28 18:24:47 UTC
Size:
2.45 KB
patch
obsolete
>From 7fc2b3e90955b604ae1838f56c7504fe4efb7556 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 28 Aug 2024 14:21:52 +0000 >Subject: [PATCH] Bug 37759: Duplicated "Set library" menu item caused by bad > merge > >This patch removes an unnecessary block of markup accidentally left >behind during a rebase of Bug 35402, removing a duplicate "Set >library..." menu item from the header menu in the staff interface. > >After the batch, users who have permission to change their logged-in >library should see only a single "Set library..." menu item in the user >menu found on the right-hand side of the header menu. > >Signed-off-by: Roman Dolny <roman.dolny@jezuici.pl> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >index d65a3dcae2..0bc5b87ecc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc >@@ -198,18 +198,7 @@ > </li> > > <li id="setlibrary_panel" style="display:none"></li> >- <li> >- <li> >- [% IF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %] >- <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set library, desk and register</a> >- [% ELSIF Koha.Preference('UseCirculationDesks') %] >- <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a> >- [% ELSIF Koha.Preference('UseCashRegisters') %] >- <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set library and cash register</a> >- [% ELSE %] >- <a class="dropdown-item" href="/cgi-bin/koha/circ/set-library.pl">Set library</a> >- [% END %] >- </li> >+ > [% ELSIF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %] > <li><hr class="dropdown-divider"></li> > <li> >-- >2.39.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 37759
:
170825
|
170837
|
170865
|
170875