From 97de5062e69239b19beceb0edfba7050a7344637 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 13 Mar 2024 10:52:28 +0000 Subject: [PATCH] Bug 36190: Fix problems found by test opac-shelves - forms were stateless - changed to GET sco-main - forms stateless - changed to GET ** untested because sco + auth is broken smart-rules.tt - JS form template - added placeholder 'cud-' op ill-requests - added cud- tp ops ** tested comments, but not checkout, simple changes boraccount - removed repeated op - updated script patroncards/edit-batch - add placeholder 'cud-' op patroncards/manage - add placheholder 'cud-' op elasticsearch/mappings - separate forms - this could use a style follow-up, but makes more sense separate I think reports/dictionary - stateless - changed to GET guided_reports_start - stateless - changed to GET suggestion/suggestion - add placeholder 'cud-' op inventory - filed bug 36305, needs more handling Signed-off-by: David Nind --- admin/searchengine/elasticsearch/mappings.pl | 2 +- ill/ill-requests.pl | 4 ++-- .../admin/searchengine/elasticsearch/mappings.tt | 10 +++++++--- .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 3 ++- .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 4 ++-- .../prog/en/modules/members/boraccount.tt | 5 +---- .../prog/en/modules/patroncards/edit-batch.tt | 4 ++-- .../prog/en/modules/patroncards/manage.tt | 2 +- .../prog/en/modules/reports/dictionary.tt | 3 +-- .../prog/en/modules/reports/guided_reports_start.tt | 3 +-- .../prog/en/modules/suggestion/suggestion.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 6 ++---- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 6 ++---- members/boraccount.pl | 2 +- 14 files changed, 27 insertions(+), 31 deletions(-) diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl index 1c0b26a50c..dc2fa3149e 100755 --- a/admin/searchengine/elasticsearch/mappings.pl +++ b/admin/searchengine/elasticsearch/mappings.pl @@ -86,7 +86,7 @@ while ( my ( $key, $value ) = each(%{Koha::SearchEngine::Elasticsearch::QueryBui $search_fields_aliases->{$value} = $field_aliases; } -if ( $op eq 'edit' ) { +if ( $op eq 'cud-edit' ) { $schema->storage->txn_begin; diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl index 8dc24d5842..2c70d1ca06 100755 --- a/ill/ill-requests.pl +++ b/ill/ill-requests.pl @@ -368,7 +368,7 @@ if ( $backends_available ) { # handle special commit rules & update type handle_commit_maybe($backend_result, $request); - } elsif ( $op eq 'check_out') { + } elsif ( $op eq 'cud-check_out') { my $request = Koha::Illrequests->find($params->{illrequest_id}); my $backend_result = $request->check_out($params); $template->param( @@ -409,7 +409,7 @@ if ( $backends_available ) { } } - } elsif ( $op eq "save_comment" ) { + } elsif ( $op eq "cud-save_comment" ) { my $comment = Koha::Illcomment->new({ illrequest_id => scalar $params->{illrequest_id}, borrowernumber => $patronnumber, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt index 3ade4c3c1e..625afa4998 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt @@ -96,8 +96,7 @@ a.add, a.delete { -
- [% INCLUDE 'csrf-token.inc' %] +
@@ -505,7 +504,12 @@ a.add, a.delete { [% END # /WRAPPER tabs %]
- + + +
+ +
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 5df0fd9d74..f536ef9760 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -1417,9 +1417,10 @@ +
[% INCLUDE 'csrf-token.inc' %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index 341715b52f..e7b2f20e59 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -265,7 +265,7 @@
- + [% IF items.size == 1 %] @@ -789,7 +789,7 @@

Add comment

- + [% INCLUDE 'csrf-token.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 5eb037b659..a051fc2732 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -244,7 +244,7 @@
@@ -346,7 +345,6 @@
@@ -386,7 +384,6 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index de6bb89c76..cd932afff5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -144,13 +144,13 @@
[% INCLUDE 'csrf-token.inc' %] - +
[% INCLUDE 'csrf-token.inc' %] - +
[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt index d9978b45b3..f92069a124 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt @@ -144,7 +144,7 @@
[% INCLUDE 'csrf-token.inc' %] - +
[% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt index 623554ba2f..facf3987be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -87,8 +87,7 @@ [% IF ( definitions ) %]

Current terms

-
- [% INCLUDE 'csrf-token.inc' %] + [% IF ( areas ) %] Filter by area diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 1682c2a103..09602bec19 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -1418,8 +1418,7 @@ [% END # /IF ( editsql ) %] [% IF ( errors ) %] - - [% INCLUDE 'csrf-token.inc' %] +
The following error was encountered:
[% FOREACH error IN errors %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index da321ebb7b..c3d3a45322 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -722,12 +722,12 @@ [% WRAPPER tab_panel tabname= suggestion.suggestiontype %] [% INCLUDE 'csrf-token.inc' %] - [%# filled by click event %] + [%# filled by click event %]
[% INCLUDE 'csrf-token.inc' %] - [%# filled by submit %] + [%# filled by submit %] [% IF suggestion.suggestions.size %]

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index d96774390d..6fae1507be 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -245,8 +245,7 @@ [% IF can_manage_shelf %] | - - [% INCLUDE 'csrf-token.inc' %] + @@ -554,8 +553,7 @@ New list [% IF can_manage_shelf %] | - - [% INCLUDE 'csrf-token.inc' %] + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index adbb4f0d94..7508a211b5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -115,8 +115,7 @@

[% END %] -
- [% INCLUDE 'csrf-token.inc' %] + Error @@ -175,8 +174,7 @@
[% END %] -
- [% INCLUDE 'csrf-token.inc' %] + Cancel diff --git a/members/boraccount.pl b/members/boraccount.pl index f629ef5605..707dc4b279 100755 --- a/members/boraccount.pl +++ b/members/boraccount.pl @@ -156,7 +156,7 @@ if ( $op eq 'cud-refund' ) { ); } -if ( $op eq 'discount' ) { +if ( $op eq 'cud-discount' ) { output_and_exit_if_error($input, $cookie, $template, { check => 'csrf_token' }); my $charge_id = scalar $input->param('accountlines_id'); my $charge = Koha::Account::Lines->find($charge_id); -- 2.30.2