From 1d23984ce34a538dbf4f5e359964cadc516fd59b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 22 Feb 2024 16:03:10 +0100 Subject: [PATCH] Bug 34478: Manual fix - admin/matching-rules Bug 34478: [TO SQUASH] Manual fix - admin/matching-rules Signed-off-by: Jonathan Druart --- admin/matching-rules.pl | 12 ++++++------ .../prog/en/modules/admin/matching-rules.tt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/admin/matching-rules.pl b/admin/matching-rules.pl index b8827126f7..3021bdb990 100755 --- a/admin/matching-rules.pl +++ b/admin/matching-rules.pl @@ -52,17 +52,17 @@ $template->param( valid_norms => \@valid_norms ); my $display_list = 0; if ($op eq "edit_matching_rule") { edit_matching_rule_form($template, $matcher_id); -} elsif ($op eq "edit_matching_rule_confirmed") { +} elsif ($op eq "cud-edit_matching_rule_confirmed") { add_update_matching_rule($template, $matcher_id); $display_list = 1; } elsif ($op eq "add_matching_rule") { add_matching_rule_form($template); -} elsif ($op eq "add_matching_rule_confirmed") { +} elsif ($op eq "cud-add_matching_rule_confirmed") { add_update_matching_rule($template, $matcher_id); $display_list = 1; } elsif ($op eq "delete_matching_rule") { delete_matching_rule_form($template, $matcher_id); -} elsif ($op eq "delete_matching_rule_confirmed") { +} elsif ($op eq "cud-delete_matching_rule_confirmed") { delete_matching_rule($template, $matcher_id); $display_list = 1; } else { @@ -82,7 +82,7 @@ sub add_matching_rule_form { $template->param( matching_rule_form => 1, - confirm_op => 'add_matching_rule_confirmed', + confirm_op => 'cud-add_matching_rule_confirmed', max_matchpoint => 1, max_matchcheck => 1 ); @@ -181,7 +181,7 @@ sub delete_matching_rule_form { my $matcher = C4::Matcher->fetch($matcher_id); $template->param( delete_matching_rule_form => 1, - confirm_op => "delete_matching_rule_confirmed", + confirm_op => "cud-delete_matching_rule_confirmed", matcher_id => $matcher_id, code => $matcher->code(), description => $matcher->description(), @@ -242,7 +242,7 @@ sub edit_matching_rule_form { $template->param( matching_rule_form => 1, edit_matching_rule => 1, - confirm_op => 'edit_matching_rule_confirmed', + confirm_op => 'cud-edit_matching_rule_confirmed', max_matchpoint => $mp_num, max_matchcheck => $mc_num ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index 531163d1b7..7349551b57 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -115,7 +115,7 @@ [% END %]
[% INCLUDE 'csrf-token.inc' %] - +
  1. @@ -430,7 +430,7 @@

    Confirm deletion of record matching rule '[% code | html %]' ([% description | html %])?

    [% INCLUDE 'csrf-token.inc' %] - +
  2. -- 2.39.2