Bugzilla – Attachment 42655 Details for
Bug 13918
Add waiting expiration date to opac list of holds for user
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13918 [QA Followup] - Improve $biblio->subtitles()
Bug-13918-QA-Followup---Improve-biblio-subtitles.patch (text/plain), 5.89 KB, created by
Kyle M Hall (khall)
on 2015-09-17 12:39:46 UTC
(
hide
)
Description:
Bug 13918 [QA Followup] - Improve $biblio->subtitles()
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2015-09-17 12:39:46 UTC
Size:
5.89 KB
patch
obsolete
>From 929cf6f2b9146259ce762ea858e45b76fa773ad1 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Mon, 24 Aug 2015 11:10:58 -0400 >Subject: [PATCH] Bug 13918 [QA Followup] - Improve $biblio->subtitles() > >--- > Koha/Biblio.pm | 12 +++- > .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 8 ++-- > t/db_dependent/BiblioObject.t | 58 ++++++++++++++++++++ > 3 files changed, 71 insertions(+), 7 deletions(-) > create mode 100755 t/db_dependent/BiblioObject.t > >diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm >index 2145a04..48c959d 100644 >--- a/Koha/Biblio.pm >+++ b/Koha/Biblio.pm >@@ -37,14 +37,20 @@ Koha::Biblio - Koha Biblio Object class > > =cut > >-=head3 subtitle >+=head3 subtitles >+ >+my @subtitles = $biblio->subtitles(); >+ >+Returns list of subtitles for a record. >+ >+Keyword to MARC mapping for subtitle must be set for this method to return any possible values. > > =cut > >-sub subtitle { >+sub subtitles { > my ( $self ) = @_; > >- return GetRecordValue( 'subtitle', GetMarcBiblio( $self->id() ), GetFrameworkCode( $self->id() ) ); >+ return map { $_->{subfield} } @{ GetRecordValue( 'subtitle', GetMarcBiblio( $self->id ), $self->frameworkcode ) }; > } > > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 3a2cc76..d571f83 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -527,8 +527,8 @@ > <td class="title"> > <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]"> > [% RESERVE.biblio.title %] >- [% FOREACH subtitl IN RESERVE.biblio.subtitle %] >- [% subtitl.subfield %] >+ [% FOREACH s IN RESERVE.biblio.subtitles %] >+ [% s %] > [% END %] > [% RESERVE.item.enumchron %] > </a> >@@ -612,9 +612,9 @@ > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> > [% IF RESERVE.suspend %] >- <h3 id="suspendModal[% RESERVE.reserve_id %]Label">Resume your hold on <i>[% RESERVE.reserves_title %]</i></h3> >+ <h3 id="suspendModal[% RESERVE.reserve_id %]Label">Resume your hold on <i>[% RESERVE.biblio.title %]</i></h3> > [% ELSE %] >- <h3 id="suspendModal[% RESERVE.reserve_id %]Label">Suspend your hold on <i>[% RESERVE.reserves_title %]</i></h3> >+ <h3 id="suspendModal[% RESERVE.reserve_id %]Label">Suspend your hold on <i>[% RESERVE.biblio.title %]</i></h3> > [% END %] > </div> > <div class="modal-body"> >diff --git a/t/db_dependent/BiblioObject.t b/t/db_dependent/BiblioObject.t >new file mode 100755 >index 0000000..c4710eb >--- /dev/null >+++ b/t/db_dependent/BiblioObject.t >@@ -0,0 +1,58 @@ >+#!/usr/bin/perl >+ >+# This file is part of Koha. >+# >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. >+# >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. >+# >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. >+ >+use Modern::Perl; >+ >+use C4::Context; >+use C4::Biblio qw( AddBiblio ); >+use Koha::Database; >+use Koha::Branches; >+use Koha::Borrowers; >+ >+use Test::More tests => 4; >+ >+use_ok('Koha::Biblio'); >+use_ok('Koha::Biblios'); >+ >+my $schema = Koha::Database->new()->schema(); >+$schema->storage->txn_begin(); >+ >+my $dbh = C4::Context->dbh; >+$dbh->{RaiseError} = 1; >+ >+my @branches = Koha::Branches->search(); >+my $borrower = Koha::Borrowers->search()->next(); >+ >+my $biblio = MARC::Record->new(); >+$biblio->append_fields( >+ MARC::Field->new( '100', ' ', ' ', a => 'Hall, Kyle' ), >+ MARC::Field->new( '245', ' ', ' ', a => "Test Record", b => "Test Record Subtitle", b => "Another Test Record Subtitle" ), >+); >+my ( $biblionumber, $biblioitemnumber ) = AddBiblio( $biblio, '' ); >+ >+my $field_mappings = Koha::Database->new()->schema()->resultset('Fieldmapping'); >+$field_mappings->delete(); >+$field_mappings->create( { field => 'subtitle', fieldcode => '245', subfieldcode => 'b' } ); >+ >+$biblio = Koha::Biblios->find( $biblionumber ); >+my @subtitles = $biblio->subtitles(); >+is( $subtitles[0], 'Test Record Subtitle', 'Got first subtitle correctly' ); >+is( $subtitles[1], 'Another Test Record Subtitle', 'Got second subtitle correctly' ); >+ >+$schema->storage->txn_rollback(); >+ >+1; >-- >1.7.2.5
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 13918
:
37271
|
37272
|
40033
|
40035
|
41862
|
41863
|
41864
|
41865
|
41945
|
41946
|
41947
|
41948
|
42652
|
42653
|
42654
|
42655
|
42656
|
42745
|
42746
|
42747
|
42748
|
42749
|
42779
|
42780
|
42781
|
42782
|
42783
|
43429
|
43430
|
43431
|
43432
|
43433
|
43438
|
43502
|
43503
|
43504
|
43505
|
43506
|
43507
|
46130
|
46131
|
46132
|
46133
|
46134
|
46135