Bug 37759 - Duplicated "Set library" menu item caused by bad merge
Summary: Duplicated "Set library" menu item caused by bad merge
Status: RESOLVED FIXED
Alias: None
Product: Koha
Classification: Unclassified
Component: Templates (show other bugs)
Version: Main
Hardware: All All
: P5 - low normal
Assignee: Owen Leonard
QA Contact: Testopia
URL:
Keywords:
Depends on: 35402
Blocks:
  Show dependency treegraph
 
Reported: 2024-08-28 13:31 UTC by Owen Leonard
Modified: 2024-11-15 20:26 UTC (History)
1 user (show)

See Also:
Change sponsored?: ---
Patch complexity: Trivial patch
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:
24.11.00
Circulation function:


Attachments
Bug 37759: Duplicated "Set library" menu item caused by bad merge (2.40 KB, patch)
2024-08-28 15:10 UTC, Owen Leonard
Details | Diff | Splinter Review
Bug 37759: Duplicated "Set library" menu item caused by bad merge (2.45 KB, patch)
2024-08-28 18:24 UTC, Roman Dolny
Details | Diff | Splinter Review
Bug 37759: Duplicated "Set library" menu item caused by bad merge (2.53 KB, patch)
2024-08-29 11:01 UTC, Jonathan Druart
Details | Diff | Splinter Review
Bug 37759: Duplicated "Set library" menu item caused by bad merge (2.51 KB, patch)
2024-08-29 15:39 UTC, Owen Leonard
Details | Diff | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Owen Leonard 2024-08-28 13:31:10 UTC
In the rebasing of Bug 35402 I made a mistake in updating header.inc, including a section which should have been removed. This has caused a duplicate "Set library" menu item in the staff interface header.
Comment 1 Owen Leonard 2024-08-28 15:10:39 UTC
Created attachment 170825 [details] [review]
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.
Comment 2 Roman Dolny 2024-08-28 18:24:47 UTC
Created attachment 170837 [details] [review]
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>
Comment 3 Jonathan Druart 2024-08-29 11:01:57 UTC
Created attachment 170865 [details] [review]
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>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Comment 4 Katrin Fischer 2024-08-29 15:16:03 UTC
Hm, I tried to rebase, but now the "gear" icon does nothing. Can you please check yourself and rebase against latest master? Going to push a batch of changes in just a little bit.
Comment 5 Owen Leonard 2024-08-29 15:39:22 UTC
Created attachment 170875 [details] [review]
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>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Comment 6 Katrin Fischer 2024-08-29 16:17:06 UTC
Pushed for 24.11!

Well done everyone, thank you!