From a6162e45fd89adae6cff599393d8f7905c00c505 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 14 Apr 2020 16:57:38 +0000 Subject: [PATCH] Bug 18680: Add an empty entry by default to sort1/sort2 values in patron account When using sort1/sort2 with authorised values to create a pull down list, there will be no empty entry unless one is manually added to the authorised values list. This is not a good default behaviour, as it can easily cause errors on patron creation. Without the empty entry, the first alphabetic value is pre-selected and will be saved if not explicitly changed. It also doesn't allow to mark sort1/sort2 as mandatory, as the value is always 'set', the required message won't be triggered. This adds an empty parameter to av-build-dropbox.inc to allow selectively adding this empty entry without causing side-effects in other places this include is used. To test: - Create authorised values for either Bsort1 or Bsort2 authorised value category - Create a new patron: - you should see a pull down list on one and an input field for the other - for the pull down list, there will be no empty entry and the first alphabetic value will be preselected - Make your sort1 and sort2 mandatory using BorrowerMandatoryField - Verify there is still on empty entry - Apply patch - Repeat tests and verify that the behaviour is as expected - There should now be an empty entry - When the field is marked mandatory and empty is left, the required warning will be shown. Signed-off-by: David Roberts Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit a934499b8cc192781f263b0ba2b3edd5374e64cf) Signed-off-by: Lucas Gass --- .../intranet-tmpl/prog/en/includes/av-build-dropbox.inc | 6 ++++-- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc index 4385125153..f3b57374fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc @@ -4,8 +4,9 @@ [%# category: the authorised value category %] [%# default: the default authorised value to select %] [%# class: the CSS class of the select element %] -[%# size: the size to use for the input (generated if the authorised value category does not exist). %] -[%# all: add a "All" entry %] +[%# size: the size to use for the input (generated if the authorised value category does not exist). %] +[%# all: add a "All" entry. All and empty should not be used at the same time. %] +[%# empty: add an empty entry. All and empty should not be used at the same time. %] [% SET avs = AuthorisedValues.GetAuthValueDropbox( category ) %] [% DEFAULT class = '' size = 20 %] @@ -13,6 +14,7 @@ [% IF avs %]