From 52ddff6daf83fb99221deed38fd2b246960f688c Mon Sep 17 00:00:00 2001 From: Jan Kissig Date: Wed, 3 Jul 2024 14:48:17 +0200 Subject: [PATCH] Bug 37209: improve Record overlay rules validation and styling This patch adds jquery form validation to the input named tag. It also changes the behavior for save and edit actions which now both can be triggered by pressing enter. Batch deletion will be only possible if no edit is taking place. Test plan: 1) a) open http://localhost:8081/cgi-bin/koha/admin/marc-overlay-rules.pl b) just click + Add rule c) the input 'tag' gets highlighted and the form won't submit 2) a) edit an existing rule b) empty input value for tag c) notice the checkboxes for batch deletion on other rules if existing d) click Save and check the input 'tag' gets highlighted and the form won't submit apply patch 1) redo steps and check that form does not get submitted and the input is marked as required via a label that says This field is required. 2) redo steps and check that form does not get submitted and the input is marked as required via a label that says This field is required. Also checkboxes for batchremove actions are gone. --- .../en/modules/admin/marc-overlay-rules.tt | 80 ++++++++----------- 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt index b36b90cdc2..b4d9b9f5a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt @@ -16,9 +16,10 @@ [% INCLUDE 'doc-head-close.inc' %] @@ -97,7 +98,7 @@ - + - - + + [% END %] @@ -162,8 +163,8 @@ - - + + - + - + Cancel @@ -260,11 +261,13 @@ [% IF rule.remove %]Remove[% ELSE %]Skip[% END %] [% IF rule.delete %]Delete[% ELSE %]Skip[% END %] - Delete + Edit + [% UNLESS edit %] + [% END %] [% END %] @@ -291,7 +294,13 @@