From 451cd3797388cec1dac28be74af499e25ca8ad9e Mon Sep 17 00:00:00 2001 From: Nick Clemens 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' %]   (format: yyyy-yyyy)

[% IF limits.$year_limit_key.defined %] - [% limits.delete($year_limit_key) %] + [% limits.delete(year_limit_key) %] [% END %] @@ -346,9 +346,9 @@
-
- Individual branches -

If multiple branches are provided, only records with items from all of those branches will be returned

+
+ Individual libraries +

If multiple libraries are provided, only records with items from all of those libraries will be returned

[% FOREACH branch IN limits.branch %] @@ -363,13 +363,13 @@ [% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all({ unfiltered => 1, selected ="" }) %]

+ [% IF search_groups %]

OR

-
- Multiple branches -

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

+
+ Multiple libraries +

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

Selecting a group will disable the option to select individual libraries

- [% IF search_groups %] [% FOREACH key IN limits.keys %] [% IF ( multibranch = key.match('^mc-homebranch_(.*)') ) %] -- 2.11.0