Bugzilla – Attachment 149821 Details for
Bug 33064
Add a search option for licenses to top search bar
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33064: Add a licenses option to the searchbar
Bug-33064-Add-a-licenses-option-to-the-searchbar.patch (text/plain), 3.58 KB, created by
Lucas Gass (lukeg)
on 2023-04-18 16:15:21 UTC
(
hide
)
Description:
Bug 33064: Add a licenses option to the searchbar
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2023-04-18 16:15:21 UTC
Size:
3.58 KB
patch
obsolete
>From acf2ef8a000dcae8b4bd3491f3dd304be73822a9 Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Date: Tue, 18 Apr 2023 13:15:42 +0000 >Subject: [PATCH] Bug 33064: Add a licenses option to the searchbar > >This patch adds a licenses option to the top searchbar > >Test plan: >1) Apply patch >2) run yarn build >3) Navigate to the ERM module >4) Observe that the top search bar should have an option for licenses >5) Click on licenses in the left hand menu, the search bar should update to show licenses as the active search option > >Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> >--- > .../intranet-tmpl/prog/en/includes/erm-search.inc | 15 +++++++++++++++ > .../intranet-tmpl/prog/js/vue/modules/erm.ts | 4 +++- > 2 files changed, 18 insertions(+), 1 deletion(-) > >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 4a5235f05e..33551de90e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc >@@ -14,6 +14,18 @@ > </form> > </div> > >+ <div id="license_search" role="tabpanel" class="tab-pane"> >+ <form action="/cgi-bin/koha/erm/licenses" method="get"> >+ <div class="form-title"> >+ <label class="control-label">License search</label> >+ </div> >+ <div class="form-content"> >+ <input type="text" name="q" id="license_filter" class="head-searchbox form-control" placeholder="Enter search keywords" size="40" /> >+ </div> >+ <button type="submit"><i class="fa fa-arrow-right"></i></button> >+ </form> >+ </div> >+ > <div id="package_search" role="tabpanel" class="tab-pane"> > <form action="/cgi-bin/koha/erm/eholdings/local/packages" method="get"> > <div class="form-title"> >@@ -43,6 +55,9 @@ > <li role="presentation" class="active"> > <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 id="license_search_tab" title="Search licenses" href="#license_search" aria-controls="license_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-gavel"></i> <span class="tab-title">Search licenses</span></a> >+ </li> > <li role="presentation"> > <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> >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 ee438d4d37..519e69d9db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/modules/erm.ts >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/modules/erm.ts >@@ -67,7 +67,9 @@ router.beforeEach((to, from) => { > router.afterEach((to, from) => { > let tab_id = 'agreement'; // Agreements > >- if (to.path.match(/\/erm\/eholdings\/local\/packages/)) { >+ if (to.path.match(/\/erm\/licenses/)) { >+ tab_id = 'license'; >+ } else if (to.path.match(/\/erm\/eholdings\/local\/packages/)) { > tab_id = 'package'; > } else if (to.path.match(/\/erm\/eholdings\/local\/titles/)) { > tab_id = 'title'; >-- >2.30.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 33064
:
149803
|
149805
|
149821
|
149822
|
150290
|
150291