Bugzilla – Attachment 119177 Details for
Bug 22605
Adding the option to modify/edit searches on the staff interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22605: (follow-up) Correct terminology and fix conditionals
Bug-22605-follow-up-Correct-terminology-and-fix-co.patch (text/plain), 3.07 KB, created by
Nick Clemens (kidclamp)
on 2021-04-05 13:03:33 UTC
(
hide
)
Description:
Bug 22605: (follow-up) Correct terminology and fix conditionals
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2021-04-05 13:03:33 UTC
Size:
3.07 KB
patch
obsolete
>From 451cd3797388cec1dac28be74af499e25ca8ad9e Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Mon, 5 Apr 2021 13:01:13 +0000 >Subject: [PATCH] Bug 22605: (follow-up) Correct terminology and fix > conditionals > >This patch hides the display of 'Multiple libraries' selection of no >groups are defined and correct the use of the term libraries over branches > >I fix the key used to delete the year limit after filling the form >--- > .../intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index 210d241125..ef8b2726d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -213,7 +213,7 @@ > [% SET year_limit_key = 'yr,st-numeric' %] > <input type="text" size="15" name="limit-yr" id="limit-yr" value="[% limits.$year_limit_key.0 | html %]"/> (format: yyyy-yyyy)</p> > [% IF limits.$year_limit_key.defined %] >- [% limits.delete($year_limit_key) %] >+ [% limits.delete(year_limit_key) %] > [% END %] > <!-- /PUB / COPY YEAR LIMIT --> > </fieldset> >@@ -346,9 +346,9 @@ > </fieldset> > > <fieldset id="select-libs"> >- <fieldset id="individual_branches"> >- <legend>Individual branches</legend> >- <p>If multiple branches are provided, only records with items from all of those branches will be returned</p> >+ <fieldset id="individual_libraries"> >+ <legend>Individual libraries</legend> >+ <p>If multiple libraries are provided, only records with items from all of those libraries will be returned</p> > [% FOREACH branch IN limits.branch %] > <span> > <input name="limit" value="branch:[% branch | html %]" type="hidden"> >@@ -363,13 +363,13 @@ > [% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all({ unfiltered => 1, selected ="" }) %] > </select></p> > </fieldset> >+ [% IF search_groups %] > <p>OR</p> >- <fieldset id="multi_branches"> >- <legend>Multiple branches</legend> >- <p>If multiple branches are selected here records with items in any of these branches will be returned. Selecting a group when some libraries are already selected will add the group libraries to the list</p> >+ <fieldset id="multi_libraries"> >+ <legend>Multiple libraries</legend> >+ <p>If multiple libraries are selected here records with items in any of these libraries will be returned. Selecting a group when some libraries are already selected will add the group libraries to the list</p> > <p>Selecting a group will disable the option to select individual libraries</p> > <!-- <input type="hidden" name="limit" value="branch: MAIN" /> --> >- [% IF search_groups %] > [% FOREACH key IN limits.keys %] > [% IF ( multibranch = key.match('^mc-homebranch_(.*)') ) %] > <span> >-- >2.11.0
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 22605
:
114728
|
114734
|
114736
|
117174
|
119177
|
123816
|
123839
|
123840
|
123965
|
126746
|
126747
|
126748
|
126838
|
126851
|
126852
|
126853
|
126854
|
126855
|
126856
|
126857
|
126858
|
126859
|
126860
|
126862
|
126863
|
126864
|
131775
|
131776
|
131777
|
131778
|
131779