From aae9f413c35a35c57253b959518f0c9acf374280 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 2 Mar 2022 10:12:11 +0000 Subject: [PATCH] Bug 22531: (QA follow-up) Fix filter and tab issues Correction to template filters and replace tabs with spaces in code to pass the QA script. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer --- .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 2 +- .../prog/en/modules/ill/log/status_change.tt | 4 ++-- t/db_dependent/Illrequests.t | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) 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 4178dc2c56..83b59d9a3d 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 @@ -645,7 +645,7 @@ [% IF request.status == 'GENREQ' && request.requested_partners.length > 0 %] : [% FOREACH partner IN request.requested_partners(1) %] - [% partner.email %] ([% partner.cardnumber %]) + [% partner.email | html %] ([% partner.cardnumber | html %]) [% IF loop.index() < loop.size() - 1 %];[% END %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt index 1bef45e991..711620574e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt @@ -9,7 +9,7 @@ from "[% display_before | html %]" ( [% FOREACH add IN log.info.additional.partner_email_previous.split('; ') %] [% borrowernumber = log.requested_partners.$add.borrowernumber %] - [% add | url %] + [% add | html %] [% END %] ) [% END %] @@ -21,7 +21,7 @@ to "[% display_after | html %]" ( [% FOREACH add IN log.info.additional.partner_email_now.split('; ') %] [% borrowernumber = log.requested_partners.$add.borrowernumber %] - [% add | url %] + [% add | html %] [% END %] ) [% END %] diff --git a/t/db_dependent/Illrequests.t b/t/db_dependent/Illrequests.t index 00092eba3e..299a512def 100755 --- a/t/db_dependent/Illrequests.t +++ b/t/db_dependent/Illrequests.t @@ -572,8 +572,8 @@ subtest 'Backend testing (mocks)' => sub { # the Dummy plugin installed. load_backend & available_backends don't # currently have tests as a result. - my $categorycode = $builder->build({ source => 'Category' })->{categorycode}; - my $branchcode = $builder->build({ source => 'Branch' })->{branchcode}; + my $categorycode = $builder->build({ source => 'Category' })->{categorycode}; + my $branchcode = $builder->build({ source => 'Branch' })->{branchcode}; my $backend = Test::MockObject->new; $backend->set_isa('Koha::Illbackends::Mock'); @@ -589,7 +589,7 @@ subtest 'Backend testing (mocks)' => sub { $config->set_always('backend_dir', 'a_dir'); $illrq->_backend($backend); - $illrq->_config($config); + $illrq->_config($config); isa_ok($illrq->_backend, 'Koha::Illbackends::Mock', "OK accessing mocked backend."); @@ -668,7 +668,7 @@ subtest 'Backend testing (mocks)' => sub { } )->store(); - my $part = $illrq->requested_partners(1); + my $part = $illrq->requested_partners(1); isa_ok($part, 'ARRAY', "requested_partners returns array when requested"); isa_ok(@{$part}[0], 'HASH', -- 2.30.2