From aa5ec5029db046f32d9e0205668494f02cfe7463 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 22 Feb 2024 16:07:40 +0100
Subject: [PATCH] Bug 34478: Manual fix - admin/patron-attr-types

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 admin/patron-attr-types.pl                    | 22 +++++++++----------
 .../en/modules/admin/patron-attr-types.tt     |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl
index 233ea2e189..4c86b634ce 100755
--- a/admin/patron-attr-types.pl
+++ b/admin/patron-attr-types.pl
@@ -55,15 +55,15 @@ my $code = $input->param("code");
 my $display_list = 0;
 if ($op eq "edit_attribute_type") {
     edit_attribute_type_form($template, $code);
-} elsif ($op eq "edit_attribute_type_confirmed") {
-    $display_list = add_update_attribute_type('cud-edit', $template, $code);
+} elsif ($op eq "cud-edit_attribute_type_confirmed") {
+    $display_list = add_update_attribute_type('edit', $template, $code);
 } elsif ($op eq "add_attribute_type") {
     add_attribute_type_form($template);
-} elsif ($op eq "add_attribute_type_confirmed") {
-    $display_list = add_update_attribute_type('cud-add', $template, $code);
+} elsif ($op eq "cud-add_attribute_type_confirmed") {
+    $display_list = add_update_attribute_type('add', $template, $code);
 } elsif ($op eq "delete_attribute_type") {
     $display_list = delete_attribute_type_form($template, $code);
-} elsif ($op eq "delete_attribute_type_confirmed") {
+} elsif ($op eq "cud-delete_attribute_type_confirmed") {
     delete_attribute_type($template, $code);
     $display_list = 1;
 } else {
@@ -87,7 +87,7 @@ sub add_attribute_type_form {
     my $patron_categories = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['description']});
     $template->param(
         attribute_type_form => 1,
-        confirm_op => 'add_attribute_type_confirmed',
+        confirm_op => 'cud-add_attribute_type_confirmed',
         categories => $patron_categories,
     );
 }
@@ -101,7 +101,7 @@ sub error_add_attribute_type_form {
 
     $template->param(
         attribute_type_form => 1,
-        confirm_op => 'add_attribute_type_confirmed',
+        confirm_op => 'cud-add_attribute_type_confirmed',
         authorised_value_category => scalar $input->param('authorised_value_category'),
     );
 }
@@ -126,7 +126,7 @@ sub add_update_attribute_type {
     my $class                     = $input->param('class');
 
     my $attr_type = Koha::Patron::Attribute::Types->find($code);
-    if ( $op eq 'cud-edit' ) {
+    if ( $op eq 'edit' ) {
         $attr_type->description($description);
     }
     else {
@@ -166,7 +166,7 @@ sub add_update_attribute_type {
     my @branches = grep { ! /^\s*$/ } $input->multi_param('branches');
     $attr_type->library_limits( \@branches );
 
-    if ( $op eq 'cud-edit' ) {
+    if ( $op eq 'edit' ) {
         $template->param( edited_attribute_type => $attr_type->code() );
     }
     else {
@@ -185,7 +185,7 @@ sub delete_attribute_type_form {
     if (defined($attr_type)) {
         $template->param(
             delete_attribute_type_form => 1,
-            confirm_op => "delete_attribute_type_confirmed",
+            confirm_op => "cud-delete_attribute_type_confirmed",
             code => $code,
             description => $attr_type->description(),
         );
@@ -244,7 +244,7 @@ sub edit_attribute_type_form {
         edit_attribute_type => 1,
         can_be_set_to_nonrepeatable => $can_be_set_to_nonrepeatable,
         can_be_set_to_unique => $can_be_set_to_unique,
-        confirm_op => 'edit_attribute_type_confirmed',
+        confirm_op => 'cud-edit_attribute_type_confirmed',
         categories => $patron_categories,
     );
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
index f13b51a1a0..22c85bd124 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
@@ -87,7 +87,7 @@
 [% END %]
 <form action="[% script_name | html %]" class="validated" method="post">
     [% INCLUDE 'csrf-token.inc' %]
-  <input type="hidden" name="op" value="cud-[% confirm_op | html %]" />
+  <input type="hidden" name="op" value="[% confirm_op | html %]" />
   <fieldset class="rows">
     <ol>
       <li>
@@ -268,7 +268,7 @@
         </h1>
         <form action="[% script_name | html %]" name="Aform" method="post">
             [% INCLUDE 'csrf-token.inc' %]
-            <input type="hidden" name="op" value="cud-[% confirm_op | html %]" />
+            <input type="hidden" name="op" value="[% confirm_op | html %]" />
             <input type="hidden" name="code" value="[% code | html %]" />
             <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete patron attribute type</button>
         </form>
-- 
2.39.2