gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 33422: (bug 32728 follow-up) ERM - Update search header depending on navigation 

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>

JD Amended commit message: link with 32728
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Matt Blenkinsop 2023-04-05 15:30:58 +00:00 committed by Tomas Cohen Arazi
parent 90dc36f57e
commit 7cc6ae331d
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc
View File

@ -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"><i class="fa fa-check-circle-o"></i> <span class="tab-title">Search agreements</span></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"><i class="fa fa-check-circle-o"></i> <span class="tab-title">Search agreements</span></a>
</li>
<li role="presentation">
<a title="Search packages" href="#package_search" aria-controls="package_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-archive"></i> <span class="tab-title">Search packages</span></a>
<a id="package_search_tab" title="Search packages" href="#package_search" aria-controls="package_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-archive"></i> <span class="tab-title">Search packages</span></a>
</li>
<li role="presentation">
<a title="Search titles" href="#title_search" aria-controls="title_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-sort-alpha-asc"></i> <span class="tab-title">Search titles</span></a>
<a id="title_search_tab" title="Search titles" href="#title_search" aria-controls="title_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-sort-alpha-asc"></i> <span class="tab-title">Search titles</span></a>
</li>
</ul>
</div><!-- /#header_search -->

10
koha-tmpl/intranet-tmpl/prog/js/vue/modules/erm.ts
View File

@ -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();
}