@@ -, +, @@ ** untested because sco + auth is broken ** tested comments, but not checkout, simple changes --- 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(-) --- a/admin/searchengine/elasticsearch/mappings.pl +++ a/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; --- a/ill/ill-requests.pl +++ a/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, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt +++ a/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 %]
- + + +
+ +
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -1417,9 +1417,10 @@ +
[% INCLUDE 'csrf-token.inc' %] - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ a/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' %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -244,7 +244,7 @@
@@ -346,7 +345,6 @@
@@ -386,7 +384,6 @@ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -144,13 +144,13 @@
[% INCLUDE 'csrf-token.inc' %] - +
[% INCLUDE 'csrf-token.inc' %] - +
[% ELSE %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt @@ -144,7 +144,7 @@
[% INCLUDE 'csrf-token.inc' %] - +
[% ELSE %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ a/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 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ a/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 %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ a/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 %]

--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ a/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' %] + --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ a/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 --- a/members/boraccount.pl +++ a/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); --