From 6124adab15d39cd94e8a8c2fa9f21bde80e0e317 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Tue, 22 Dec 2020 19:28:28 +0000
Subject: [PATCH] Bug 27297: Add required and blank options to
 av-build-dropbox.inc

This patch adds two options to av-build-drobx
required - which will add the required attribute to the select
blank - which will add a blank option to avoid preselecting others

To test:
1 - In OpacSuggestionMandatoryFeilds select itemtype
2 - Go to OPAC
3 - Add a suggestion
4 - Don't fill out any fields
5 - Submit
6 - Suggestion is added
7 - Delete it
8 - Apply patch
9 - Add a suggestion
10 - Note itemtyp edefaults to 'None'
11 - You cannot submit until you select a value

Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit cb95c9140316d4b9dc28cd696d14106b460774aa)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc | 9 ++++++++-
 .../opac-tmpl/bootstrap/en/modules/opac-suggestions.tt   | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc
index 8e88cb55fc..9b833fcfe0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc
@@ -10,7 +10,14 @@
 [% DEFAULT class = '' size = 20 %]
 
 [% IF avs %]
-  <select id="[% name | html %]" name="[% name | html %]" class="[% class | html %]" >
+  [% IF required %]
+      <select id="[% name | html %]" name="[% name | html %]" class="[% class | html %]" required="required">
+  [% ELSE %]
+      <select id="[% name | html %]" name="[% name | html %]" class="[% class | html %]">
+  [% END %]
+  [% IF blank %]
+    <option value="">None</option>
+  [% END %]
   [% FOR av IN avs %]
     [% IF av.authorised_value == default %]
       <option value="[% av.authorised_value | html %]" selected="selected">[% av.lib | html_entity %]</option>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index 929d7094a5..d5dde87f01 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -166,11 +166,11 @@
                                             <li>
                                             [% IF ( itemtype_required ) %]
                                                 <label for="itemtype" class="required">Item type:</label>
-                                                [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20 %]
+                                                [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20, required = 1, blank = 1 %]
                                                 <span class="required">Required</span>
                                             [% ELSE %]
                                                 <label for="itemtype">Item type:</label>
-                                                [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20 %]
+                                                [% PROCESS 'av-build-dropbox.inc' name="itemtype", category="SUGGEST_FORMAT", size = 20, blank = 1 %]
                                             [% END %]
                                             </li>
                                         [% END %]
-- 
2.39.5