Bugzilla – Attachment 145729 Details for
Bug 22531
Allow for multiple requests to partners and display partners in audit log
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22531: (QA follow-up) Fix filter and tab issues
Bug-22531-QA-follow-up-Fix-filter-and-tab-issues.patch (text/plain), 4.53 KB, created by
Pedro Amorim
on 2023-01-27 12:37:32 UTC
(
hide
)
Description:
Bug 22531: (QA follow-up) Fix filter and tab issues
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2023-01-27 12:37:32 UTC
Size:
4.53 KB
patch
obsolete
>From aae9f413c35a35c57253b959518f0c9acf374280 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >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 <martin.renvoize@ptfs-europe.com> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../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) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% partner.borrowernumber %]">[% partner.email %] ([% partner.cardnumber %])</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% partner.borrowernumber | uri %]">[% partner.email | html %] ([% partner.cardnumber | html %])</a> > [% 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 %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">[% add | url %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% add | html %]</a> > [% 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 %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">[% add | url %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% add | html %]</a> > [% 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 22531
:
86723
|
86744
|
118843
|
118844
|
122643
|
122644
|
124979
|
124980
|
131234
|
131235
|
131236
|
131237
|
133708
|
133709
|
133710
|
133711
|
145726
|
145727
|
145728
| 145729 |
145730