Attachment 149221 Details for Bug 33422 – Bug 33422: ERM search header should change

[patch] Bug 33422: ERM search header should change

Bug-33422-ERM-search-header-should-change.patch (text/plain), 3.96 KB, created by David Nind on 2023-04-05 16:49:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-04-05 16:49:44 UTC

Size: 3.96 KB

patch

obsolete

>From 36f95e8f8242a73b6000713dfaca6f4a3f0b3bf6 Mon Sep 17 00:00:00 2001
>From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>Date: Wed, 5 Apr 2023 15:30:58 +0000
>Subject: [PATCH] Bug 33422: ERM search header should change
>
>This patch removes reference to a non-existent id ("ui-id-X") and replaces it with new ids specific to agreements, titles and packages.
>
>Test plan:
>1) Apply patch
>2) Navigate between Agreements, Packages, Titles using the sidebar. The search bar should change each time to match the section
>3) Add some agreemens, packages, titles
>4) Perform a search using the different search bar options. Each time it should take you to the correct page with the search activated in the KohaTable. The navbar should also be highlighted to match the correct section and the top search bar should also show the correct section
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../intranet-tmpl/prog/en/includes/erm-search.inc | 6 +++---
> koha-tmpl/intranet-tmpl/prog/js/vue/modules/erm.ts | 10 ++++++----
> 2 files changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc
>index 471add266d..4a5235f05e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc
>@@ -41,13 +41,13 @@
> 
> <ul class="nav nav-tabs" role="tablist">
> <li role="presentation" class="active">
>- <a title="Search agreements" href="#agreement_search" aria-controls="agreement_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"> Search agreements</a>
>+ <a id="agreement_search_tab" title="Search agreements" href="#agreement_search" aria-controls="agreement_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"> Search agreements</a>
> </li>
> <li role="presentation">
>- <a title="Search packages" href="#package_search" aria-controls="package_search" role="tab" data-toggle="tab" class="keep_text"> Search packages</a>
>+ <a id="package_search_tab" title="Search packages" href="#package_search" aria-controls="package_search" role="tab" data-toggle="tab" class="keep_text"> Search packages</a>
> </li>
> <li role="presentation">
>- <a title="Search titles" href="#title_search" aria-controls="title_search" role="tab" data-toggle="tab" class="keep_text"> Search titles</a>
>+ <a id="title_search_tab" title="Search titles" href="#title_search" aria-controls="title_search" role="tab" data-toggle="tab" class="keep_text"> Search titles</a>
> </li>
> </ul>
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/modules/erm.ts b/koha-tmpl/intranet-tmpl/prog/js/vue/modules/erm.ts
>index e4290931df..5d160072bd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/vue/modules/erm.ts
>+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/modules/erm.ts
>@@ -62,13 +62,15 @@ router.beforeEach((to, from) => {
> removeMessages(); // This will actually flag the messages as displayed already
> });
> router.afterEach((to, from) => {
>- let tab_id = 1; // Agreements
>+ let tab_id = 'agreement'; // Agreements
>+
> if (to.path.match(/\/erm\/eholdings\/local\/packages/)) {
>- tab_id = 2;
>+ tab_id = 'package';
> } else if (to.path.match(/\/erm\/eholdings\/local\/titles/)) {
>- tab_id = 3;
>+ tab_id = 'title';
> }
>- let node = document.getElementById("ui-id-" + tab_id);
>+ let node = document.getElementById(`${tab_id}_search_tab`);
>+
> if (node) {
> node.click();
> }
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33422: 149220 | 149221 | 149224 | 149227