From 590e235fce0b626d8e34c5f8a398dd87a4254bb4 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 26 Jan 2024 11:02:56 +0100
Subject: [PATCH] Bug 34478: Rename action with op - admin/library_groups

This is a bit dirty but it works.
form is not styling correctly when put within the li

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 admin/library_groups.pl                       |  8 ++---
 .../prog/en/modules/admin/library_groups.tt   | 33 ++++++++++++++-----
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/admin/library_groups.pl b/admin/library_groups.pl
index be46eacb99..5531689336 100755
--- a/admin/library_groups.pl
+++ b/admin/library_groups.pl
@@ -38,10 +38,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $action = $cgi->param('action') || q{};
+my $op = $cgi->param('op') || q{};
 my @messages;
 
-if ( $action eq 'cud-add' ) {
+if ( $op eq 'cud-add' ) {
     my $parent_id   = $cgi->param('parent_id')   || undef;
     my $title       = $cgi->param('title')       || undef;
     my $description = $cgi->param('description') || undef;
@@ -81,7 +81,7 @@ if ( $action eq 'cud-add' ) {
         }
     }
 }
-elsif ( $action eq 'cud-edit' ) {
+elsif ( $op eq 'cud-edit' ) {
     my $id          = $cgi->param('id')          || undef;
     my $title       = $cgi->param('title')       || undef;
     my $description = $cgi->param('description') || undef;
@@ -111,7 +111,7 @@ elsif ( $action eq 'cud-edit' ) {
         $template->param( edited => $group );
     }
 }
-elsif ( $action eq 'cud-delete' ) {
+elsif ( $op eq 'cud-delete' ) {
     my $id = $cgi->param('id');
 
     my $group = Koha::Library::Groups->find($id);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
index 2810ee4feb..85e12cfb72 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
@@ -103,7 +103,8 @@
     </div> <!-- /.row -->
 
     <div id="add-group-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="add-group-modal-label" aria-hidden="true">
-        <form method="get" id="add-group-form" action="/cgi-bin/koha/admin/library_groups.pl" class="form-horizontal">
+        <form method="post" id="add-group-form" action="/cgi-bin/koha/admin/library_groups.pl" class="form-horizontal">
+            [% INCLUDE 'csrf-token.inc' %]
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -112,7 +113,7 @@
                     <div class="modal-body">
                         <fieldset class="rows">
                             <input type="hidden" id="add-group-modal-parent-id" name="parent_id" value="" />
-                            <input type="hidden" id="add-group-modal-action" name="action" value="add">
+                            <input type="hidden" id="add-group-modal-action" name="op" value="cud-add">
                             <ol>
                                 <li>
                                     <label for="add-group-modal-title">Title: </label>
@@ -178,7 +179,8 @@
     </div>
 
     <div id="edit-group-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="edit-group-modal-label" aria-hidden="true">
-        <form method="get" id="edit-group-form" action="/cgi-bin/koha/admin/library_groups.pl" class="form-horizontal">
+        <form method="post" id="edit-group-form" action="/cgi-bin/koha/admin/library_groups.pl" class="form-horizontal">
+            [% INCLUDE 'csrf-token.inc' %]
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -186,7 +188,7 @@
                     </div>
                     <div class="modal-body">
                         <input type="hidden" id="edit-group-modal-id" name="id" value="" />
-                        <input type="hidden" id="edit-group-modal-action" name="action" value="edit" />
+                        <input type="hidden" id="edit-group-modal-action" name="op" value="cud-edit" />
                         <fieldset class="rows">
                             <ol>
                                 <li>
@@ -254,10 +256,11 @@
     </div>
 
     <div id="delete-group-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="delete-group-modal-label" aria-hidden="true">
-        <form method="get" action="/cgi-bin/koha/admin/library_groups.pl">
+        <form method="post" action="/cgi-bin/koha/admin/library_groups.pl">
+            [% INCLUDE 'csrf-token.inc' %]
             <div class="modal-dialog">
                 <div class="modal-content">
-                    <input id="delete-group-modal-action" type="hidden" name="action" value="delete" />
+                    <input id="delete-group-modal-action" type="hidden" name="op" value="cud-delete" />
                     <input id="delete-group-modal-id" type="hidden" name="id" value="" />
                     <div class="modal-header">
                         <h3 id="delete-group-modal-label">Delete group</h3>
@@ -275,10 +278,11 @@
     </div>
 
     <div id="remove-library-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="remove-library-modal-label" aria-hidden="true">
-        <form method="get" action="/cgi-bin/koha/admin/library_groups.pl">
+        <form method="post" action="/cgi-bin/koha/admin/library_groups.pl">
+            [% INCLUDE 'csrf-token.inc' %]
             <div class="modal-dialog">
                 <div class="modal-content">
-                    <input id="remove-library-modal-action" type="hidden" name="action" value="delete" />
+                    <input id="remove-library-modal-action" type="hidden" name="op" value="cud-delete" />
                     <input id="remove-library-modal-id" type="hidden" name="id" value="" />
                     <div class="modal-header">
                         <h3 id="remove-library-modal-label">Remove library from group</h3>
@@ -482,10 +486,21 @@
 
                 <div class="btn-group">
                     <button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Add library <span class="caret"></span></button>
+                    [% FOREACH library IN group.libraries_not_direct_children %]
+                        [% SET form_id = "add-library-" _ library.id _ "-" _ group.id %]
+                        <form id="[% form_id | uri %]" class="add-library" method="post" action="/cgi-bin/koha/admin/library_groups.pl">
+                            [% INCLUDE 'csrf-token.inc' %]
+                            <input type="hidden" name="op" value="cud-add" />
+                            <input type="hidden" name="parent_id" value="[% group.id | uri %]" />
+                            <input type="hidden" name="branchcode" value="[% library.id | uri %]" />
+                        </form>
+                    [% END %]
+
                     <ul class="dropdown-menu">
                         [% FOREACH library IN group.libraries_not_direct_children %]
+                            [% SET form_id = "add-library-" _ library.id _ "-" _ group.id %]
                             <li>
-                                <a class="add-library" id="add-library[% library.id | html %]-[% group.id | html %]" href="/cgi-bin/koha/admin/library_groups.pl?action=add&parent_id=[% group.id | html %]&branchcode=[% library.id | html %]">
+                                <a href="#" class="add-library" onclick="$('#[% form_id | uri %]').submit(); return false;">
                                     [% library.branchname | html %]
                                 </a>
                            </li>
-- 
2.39.5