From b7dd0d62ddf324a6f54dd3c6f7cb6babcd61ad2d Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 6 Nov 2020 12:48:28 +0000 Subject: [PATCH] Bug 24665: (QA follow-up) Fix selection default This patch updates the html_helper for the cash register selection block to remove the 'empty option' such that it can be correclty set for each select case and updates all existing cases where we used the process block previously to include the relevant blank option '-- Select an option --', '-- None --', 'Library default' and finally the new '-- All --' options introduced with this bug. Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc | 5 ----- koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt | 1 + .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 6 ++++-- .../intranet-tmpl/prog/en/modules/members/paycollect.tt | 6 ++++-- koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 3 ++- .../prog/en/modules/reports/cash_register_stats.tt | 1 + 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc index 123aff9ce1..86eab2547f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc @@ -24,11 +24,6 @@ [% END %] [% BLOCK options_for_registers %] - [% IF register_required %] - - [% ELSE %] - - [% END %] [% FOREACH r IN registers %] [% IF r.branch == Branches.GetLoggedInBranchcode %] [% IF r.selected %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt index 9d63b7230b..b980f1e3af 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt @@ -102,9 +102,7 @@

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt index be0003b93d..c61493439f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt @@ -106,6 +106,7 @@ Updated: