Bugzilla – Attachment 148181 Details for
Bug 3150
Move emails for sending cart and list contents into notices tool
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 3150: (follow-up) Make subs to get host/related parts for notices
Bug-3150-follow-up-Make-subs-to-get-hostrelated-pa.patch (text/plain), 8.58 KB, created by
Kyle M Hall (khall)
on 2023-03-14 17:09:22 UTC
(
hide
)
Description:
Bug 3150: (follow-up) Make subs to get host/related parts for notices
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2023-03-14 17:09:22 UTC
Size:
8.58 KB
patch
obsolete
>From ce1edca72e890677d55316978018e0c64e62aba2 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Mon, 27 Feb 2023 00:26:09 +0000 >Subject: [PATCH] Bug 3150: (follow-up) Make subs to get host/related parts for > notices > >Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > Koha/Biblio.pm | 32 +++++++++++++++++++ > .../bug_3150_-_add_LIST_and_CART_notices.pl | 4 +-- > .../mysql/en/mandatory/sample_notices.yml | 4 +-- > t/db_dependent/Koha/Biblio/host_record.t | 8 ++++- > 4 files changed, 43 insertions(+), 5 deletions(-) > >diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm >index d94bde986c..67ec343cc4 100644 >--- a/Koha/Biblio.pm >+++ b/Koha/Biblio.pm >@@ -1322,6 +1322,38 @@ sub get_marc_host { > } > } > >+=head3 get_marc_host_only >+ >+ my $host = $biblio->get_marc_host_only; >+ >+Return host only >+ >+=cut >+ >+sub get_marc_host_only { >+ my ($self) = @_; >+ >+ my ( $host, $relatedparts ) = $self->get_marc_host; >+ >+ return $host; >+} >+ >+=head3 get_marc_relatedparts_only >+ >+ my $relatedparts = $biblio->get_marc_relatedparts_only; >+ >+Return related parts only >+ >+=cut >+ >+sub get_marc_relatedparts_only { >+ my ($self) = @_; >+ >+ my ( $host, $relatedparts ) = $self->get_marc_host; >+ >+ return $relatedparts; >+} >+ > =head3 recalls > > my $recalls = $biblio->recalls; >diff --git a/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.pl b/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.pl >index d06071af8f..c6525f7f10 100755 >--- a/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.pl >+++ b/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.pl >@@ -28,7 +28,7 @@ Please note that the attached file is a MARC bibliographic records file which ca > [% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %]<br>[% END %] > [% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %]<br>[% END %] > [% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %]<br>[% END %] >-[% IF ( biblio.get_marc_host ) %]In: [% FOREACH entry IN biblio.get_marc_host %][% entry.title | html %][% IF ( entry.subtitle ) %][% FOREACH subtitle IN entry.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% entry.part_number | html %] [% entry.part_name | html %]<br>[% END %][% END %] >+[% IF ( biblio.get_marc_host_only ) %]In: [% FOREACH entry IN biblio.get_marc_host_only %][% entry.title | html %][% IF ( entry.subtitle ) %][% FOREACH subtitle IN entry.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% entry.part_number | html %] [% entry.part_name | html %]<br>[% END %] [% biblio.get_marc_relatedparts_only %][% END %] > [% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %]<br>[% END %] > <a href='[% Koha.Preference('OpacBaseUrl') %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]'>View in online catalog</a> > [% IF ( biblio.items.count > 0 ) %]<br>Items: <ul>[% FOREACH item IN biblio.items %]<li>[% Branches.GetName( item.holdingbranch ) | html %] >@@ -56,7 +56,7 @@ Please note that the attached file is a MARC bibliographic records file which ca > [% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %]<br>[% END %] > [% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %]<br>[% END %] > [% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %]<br>[% END %] >-[% IF ( biblio.get_marc_host ) %]In: [% FOREACH entry IN biblio.get_marc_host %][% entry.title | html %][% IF ( entry.subtitle ) %][% FOREACH subtitle IN entry.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% entry.part_number | html %] [% entry.part_name | html %]<br>[% END %][% END %] >+[% IF ( biblio.get_marc_host_only ) %]In: [% FOREACH entry IN biblio.get_marc_host_only %][% entry.title | html %][% IF ( entry.subtitle ) %][% FOREACH subtitle IN entry.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% entry.part_number | html %] [% entry.part_name | html %]<br>[% END %] [% biblio.get_marc_relatedparts_only %][% END %] > [% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %]<br>[% END %] > <a href='[% Koha.Preference('OpacBaseUrl') %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]'>View in online catalog</a> > [% IF ( biblio.items.count > 0 ) %]<br>Items: <ul>[% FOREACH item IN biblio.items %]<li>[% Branches.GetName( item.holdingbranch ) | html %] >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index 098aed1e7c..c99fb0d0c6 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -2215,7 +2215,7 @@ tables: > - "[% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %]<br>[% END %]" > - "[% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %]<br>[% END %]" > - "[% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %]<br>[% END %]" >- - "[% IF ( biblio.get_marc_host ) %]In: [% FOREACH entry IN biblio.get_marc_host %][% entry.title | html %][% IF ( entry.subtitle ) %][% FOREACH subtitle IN entry.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% entry.part_number | html %] [% entry.part_name | html %]<br>[% END %][% END %]" >+ - "[% IF ( biblio.get_marc_host_only ) %]In: [% FOREACH entry IN biblio.get_marc_host_only %][% entry.title | html %][% IF ( entry.subtitle ) %][% FOREACH subtitle IN entry.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% entry.part_number | html %] [% entry.part_name | html %]<br>[% END %] [% biblio.get_marc_relatedparts_only %][% END %]" > - "[% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %]<br>[% END %]" > - "[<a href='[% Koha.Preference('OpacBaseUrl') %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]'>View in online catalog</a>" > - "[% IF ( biblio.items.count > 0 ) %]<br>Items: <ul>[% FOREACH item IN biblio.items %]<li>[% Branches.GetName( item.holdingbranch ) | html %]" >@@ -2250,7 +2250,7 @@ tables: > - "[% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %]<br>[% END %]" > - "[% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %]<br>[% END %]" > - "[% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %]<br>[% END %]" >- - "[% IF ( biblio.get_marc_host ) %]In: [% FOREACH entry IN biblio.get_marc_host %][% entry.title | html %][% IF ( entry.subtitle ) %][% FOREACH subtitle IN entry.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% entry.part_number | html %] [% entry.part_name | html %]<br>[% END %][% END %]" >+ - "[% IF ( biblio.get_marc_host_only ) %]In: [% FOREACH entry IN biblio.get_marc_host_only %][% entry.title | html %][% IF ( entry.subtitle ) %][% FOREACH subtitle IN entry.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% entry.part_number | html %] [% entry.part_name | html %]<br>[% END %] [% biblio.get_marc_relatedparts_only %][% END %]" > - "[% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %]<br>[% END %]" > - "<a href='[% Koha.Preference('OpacBaseUrl') %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]'>View in online catalog</a>" > - "[% IF ( biblio.items.count > 0 ) %]<br>Items: <ul>[% FOREACH item IN biblio.items %]<li>[% Branches.GetName( item.holdingbranch ) | html %]" >diff --git a/t/db_dependent/Koha/Biblio/host_record.t b/t/db_dependent/Koha/Biblio/host_record.t >index 4094a102cb..aab1c36d02 100755 >--- a/t/db_dependent/Koha/Biblio/host_record.t >+++ b/t/db_dependent/Koha/Biblio/host_record.t >@@ -36,7 +36,7 @@ $schema->storage->txn_begin; > our $builder = t::lib::TestBuilder->new; > > subtest 'get_marc_host' => sub { >- plan tests => 15; >+ plan tests => 17; > > t::lib::Mocks::mock_preference( 'marcflavour', 'MARC21' ); > t::lib::Mocks::mock_preference( 'MARCOrgCode', 'xyz' ); >@@ -92,6 +92,12 @@ subtest 'get_marc_host' => sub { > ( $host, $relatedparts, $info ) = $bib1->get_marc_host; > is( $host, undef, 'No Koha Biblio object returned with no $w' ); > is( $info, "title, relpart", '773$atg returned when no $w' ); >+ >+ my $host_only = $bib1->get_marc_host_only; >+ is_deeply( $host_only, $host, "Host only retrieved successfully" ); >+ my $relatedparts_only = $bib1->get_marc_relatedparts_only; >+ is_deeply( $relatedparts_only, $relatedparts, "Related parts only retrieved successfully" ); >+ > $marc->field('773')->delete_subfield( code => 't' ); # restore > > # Add second 773 >-- >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 3150
:
114127
|
114545
|
114579
|
114582
|
117237
|
118313
|
120477
|
120478
|
121026
|
121027
|
121037
|
121038
|
123020
|
123021
|
123022
|
125225
|
125226
|
125227
|
125379
|
126544
|
126545
|
126546
|
126547
|
130150
|
130151
|
130152
|
130153
|
134304
|
134305
|
134306
|
134307
|
134308
|
134477
|
137690
|
137691
|
137692
|
137693
|
137694
|
137716
|
137717
|
137718
|
137719
|
137720
|
137878
|
140246
|
140247
|
140248
|
140249
|
140250
|
140251
|
140252
|
140253
|
140254
|
140255
|
140256
|
140257
|
140258
|
140259
|
145229
|
145230
|
145231
|
145232
|
145233
|
145234
|
145676
|
145677
|
145678
|
145679
|
145680
|
145681
|
146560
|
146561
|
146562
|
146563
|
146564
|
146565
|
146566
|
146858
|
146859
|
146860
|
146861
|
146862
|
146863
|
146864
|
146865
|
146866
|
146867
|
146987
|
147423
|
147868
|
147869
|
147870
|
147871
|
147872
|
147873
|
147874
|
147875
|
147876
|
147877
|
147878
|
147879
|
147880
|
148045
|
148170
|
148171
|
148172
|
148173
|
148174
|
148175
|
148176
|
148177
|
148178
|
148179
|
148180
| 148181 |
148182
|
148183
|
148184
|
148185