From 50b8e1ca97399330e94ad15f566ef9763c3a3152 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Mon, 29 Oct 2018 11:25:58 -0300
Subject: [PATCH] Bug 21706: (follow-up) Fix subfield delete button

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
---
 admin/auth_subfields_structure.pl                             | 1 -
 .../prog/en/modules/admin/auth_subfields_structure.tt         | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index e19edfbe8c..866e5f7407 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -315,7 +315,6 @@ if ($op eq 'add_form') {
 		$row_data{value_builder}	= $results->[$i]{'value_builder'};
 		$row_data{hidden}	= $results->[$i]{'hidden'} if($results->[$i]{'hidden'} gt "000") ;
 		$row_data{isurl}	= $results->[$i]{'isurl'};
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&amp;authtypecode=$authtypecode";
 		if ($row_data{tab} eq -1) {
 			$row_data{subfield_ignored} = 1;
 		}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
index ef6d8dde86..e09a45a6f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
@@ -301,7 +301,7 @@
                 [% IF ( loo.value_builder ) %] | <strong>Plugin:</strong>[% loo.value_builder | html %],[% END %]
             [% END %]
         </td>
-        <td><a href="[% loo.delete | url %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td>
+        <td><a href="?op=delete_confirm&amp;tagfield=[% loo.tagfield | uri %]&amp;tagsubfield=[% loo.tagsubfield | uri %]&amp;authtypecode=[% authtypecode | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td>
     </tr>
     [% END %]
 </table>
@@ -311,7 +311,7 @@
     <input type="hidden" name="tagfield" value="[% edit_tagfield | html %]" />
     <input type="hidden" name="authtypecode" value="[% edit_authtypecode | html %]" />
     <input type="submit" value="Edit subfields" />
-    <a class="cancel" href="auth_tag_structure.pl?searchfield=[% tagfield | uri%]&amp;authtypecode=[% authtypecode | uri %]">Cancel</a></fieldset>
+    <a class="cancel" href="auth_tag_structure.pl?searchfield=[% tagfield | uri %]&amp;authtypecode=[% authtypecode | uri %]">Cancel</a></fieldset>
     </form>
 
     [% IF ( previous ) %]
-- 
2.39.5