From bd9ef8f5843fa7bcb49dc490001c79750035e0d0 Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Thu, 22 Feb 2018 13:52:10 +0100
Subject: [PATCH] Bug 15774: Fix additional fields filters
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Addresses the following QA comments:

1/ Regression:
On serials/serials-search.pl, the filters are not filled with what the
users searched for and the additional fields linked to an AV are not
displayed as a dropdown list.

4/ When searching an order, there is no way not to set a "all" value for
additional fields linked to AV.

5/ When searching an order and the search does not return any results,
the field should contain what the user filled in.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15774#c10
Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../prog/en/includes/additional-fields-entry.inc       |  5 +++--
 .../prog/en/modules/serials/serials-search.tt          | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc
index a961e55292..123e5b38c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc
@@ -9,8 +9,9 @@
                 <label for="additional_field_[% field.id %]"> [% field.name %]: </label>
                 [% IF field.authorised_value_category %]
                     <select name="additional_field_[% field.id %]" id="additional_field_[% field.id %]">
-                        [% FOREACH av IN AuthorisedValues.Get( field.authorised_value_category, values.${field.name} ) %]
-                            [% IF av.selected %]
+                        <option value="">All</option>
+                        [% FOREACH av IN AuthorisedValues.GetAuthValueDropbox( field.authorised_value_category ) %]
+                            [% IF av.authorised_value == values.${field.name} %]
                                 <option value="[% av.authorised_value %]" selected="selected">[% av.lib %]</option>
                             [% ELSE %]
                                 <option value="[% av.authorised_value %]">[% av.lib %]</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
index 80cf0d6260..01ebae0b1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -372,11 +372,11 @@
                 [% FOR field IN additional_fields_for_subscription %]
                   <li>
                     <label for="additional_field_[% field.id | html %]ID"> [% field.name | html %]: </label>
-                    [% IF field.authorised_value_choices %]
-                      <select id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]_filter">
+                    [% IF field.authorised_value_category %]
+                      <select id="additional_field_[% field.id | html %]" name="additional_field_[% field.id | html %]">
                         <option value="">All</option>
-                        [% FOREACH av IN field.authorised_value_choices %]
-                          [% IF av.authorised_value == additional_field_filters.${field.name}.value %]
+                        [% FOREACH av IN AuthorisedValues.GetAuthValueDropbox(field.authorised_value_category) %]
+                          [% IF av.authorised_value == additional_field_filters.${field.name} %]
                             <option value="[% av.authorised_value | html %]" selected="selected">[% av.lib | html %]</option>
                           [% ELSE %]
                             <option value="[% av.authorised_value | html %]">[% av.lib | html %]</option>
@@ -384,7 +384,7 @@
                         [% END %]
                       </select>
                     [% ELSE %]
-                      <input id="additional_field_[% field.id | html %]" type="text" value="[% additional_field_filters.${field.name}.value | html %]" name="additional_field_[% field.id | html %]_filter" />
+                      <input id="additional_field_[% field.id | html %]" type="text" value="[% additional_field_filters.${field.name} | html %]" name="additional_field_[% field.id | html %]" />
                     [% END %]
                   </li>
                 [% END %]
-- 
2.39.5