From a41c9404b4b7956cbec75553d397999f13557b32 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 11 Oct 2021 15:46:05 +0200
Subject: [PATCH] Bug 28445: Fix subfields to blank

The value of the checkbox was not correct

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc | 2 +-
 tools/batchMod.pl                                         | 3 +--
 2 files changed, 2 insertions(+), 3 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 52f2c8faf0..26e1f348a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -152,7 +152,7 @@
 
                     [% IF add_delete_checkbox %]
                         [% UNLESS ( subfield.mandatory ) %]
-                            <input type="checkbox" id="row[% subfield.tag | html %][% subfield.subfield | html %][% subfield.random | html %]" title="Check to delete subfield [% subfield.subfield | html %]" name="disable_input" value="[% subfield.subfield | html %]" />
+                            <input type="checkbox" id="row[% subfield.tag | html %][% subfield.subfield | html %][% subfield.random | html %]" title="Check to delete subfield [% subfield.subfield | html %]" name="disable_input" value="[% kohafield | html %]" />
                         [% ELSE %]
                             <span class="required">Required</span>
                         [% END %]
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index e5ba87cfbb..81745c3e6f 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -138,8 +138,7 @@ if ( $op eq "action" ) {
                   . encode_utf8($attr)
                   ;  # We need to deal correctly with encoding on subfield codes
 
-                if ( grep { $attr eq $_ } @subfields_to_blank ) {
-
+                if ( grep { $cgi_var_name eq $_ } @subfields_to_blank ) {
                     # Empty this column
                     $new_item_data->{$attr} = undef;
                 }
-- 
2.20.1