Bugzilla – Attachment 89237 Details for
Bug 11529
Add subtitle, medium and part fields to biblio table
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11529: Clean up subtitle usage
Bug-11529-Clean-up-subtitle-usage.patch (text/plain), 58.47 KB, created by
Ere Maijala
on 2019-05-02 13:04:50 UTC
(
hide
)
Description:
Bug 11529: Clean up subtitle usage
Filename:
MIME Type:
Creator:
Ere Maijala
Created:
2019-05-02 13:04:50 UTC
Size:
58.47 KB
patch
obsolete
>From ddedec85d0e2a0259958db89c4557ba934d308c0 Mon Sep 17 00:00:00 2001 >From: Ere Maijala <ere.maijala@helsinki.fi> >Date: Mon, 19 Nov 2018 10:37:08 +0200 >Subject: [PATCH] Bug 11529: Clean up subtitle usage > >Unify and clean up subtitle usage so that it's always used as a simple array and not the old hash structure. > >Signed-off-by: Michal Denar <black23@gmail.com> > >Signed-off-by: Michal Denar <black23@gmail.com> > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >--- > C4/Biblio.pm | 19 +++++++++++-------- > C4/ShelfBrowser.pm | 2 +- > acqui/neworderbiblio.pl | 2 +- > circ/reserveratios.pl | 2 +- > circ/transferstoreceive.pl | 2 +- > .../prog/en/modules/acqui/neworderbiblio.tt | 2 +- > .../prog/en/modules/authorities/merge.tt | 4 ++-- > .../prog/en/modules/basket/basket.tt | 4 ++-- > .../prog/en/modules/catalogue/detail.tt | 4 ++-- > .../prog/en/modules/catalogue/imageviewer.tt | 4 ++-- > .../prog/en/modules/catalogue/moredetail.tt | 6 +++--- > .../en/modules/catalogue/stockrotation.tt | 2 +- > .../prog/en/modules/cataloguing/addbooks.tt | 2 +- > .../prog/en/modules/cataloguing/merge.tt | 2 +- > .../circ/circulation_batch_checkouts.tt | 2 +- > .../prog/en/modules/circ/reserveratios.tt | 2 +- > .../en/modules/circ/transferstoreceive.tt | 2 +- > .../prog/en/modules/reserve/request.tt | 2 +- > .../prog/en/modules/tags/list.tt | 2 +- > .../en/modules/tools/batch_delete_records.tt | 2 +- > .../en/modules/virtualshelves/sendshelf.tt | 2 +- > .../prog/en/modules/virtualshelves/shelves.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 8 ++++++-- > koha-tmpl/intranet-tmpl/prog/js/holds.js | 4 +++- > .../bootstrap/en/includes/shelfbrowser.inc | 2 +- > .../bootstrap/en/modules/opac-basket.tt | 4 ++-- > .../bootstrap/en/modules/opac-detail.tt | 6 +++--- > .../bootstrap/en/modules/opac-opensearch.tt | 2 +- > .../en/modules/opac-readingrecord.tt | 6 +++--- > .../bootstrap/en/modules/opac-reserve.tt | 2 +- > .../en/modules/opac-results-grouped.tt | 4 ++-- > .../bootstrap/en/modules/opac-results.tt | 2 +- > .../bootstrap/en/modules/opac-sendshelf.tt | 2 +- > .../bootstrap/en/modules/opac-shelves.tt | 2 +- > .../en/modules/opac-showreviews-rss.tt | 2 +- > .../bootstrap/en/modules/opac-showreviews.tt | 2 +- > .../bootstrap/en/modules/opac-tags.tt | 2 +- > .../bootstrap/en/modules/opac-user.tt | 4 ++-- > opac/opac-reserve.pl | 2 +- > opac/opac-tags.pl | 2 +- > opac/opac-user.pl | 2 +- > reserve/request.pl | 3 +++ > svc/checkouts | 4 ++-- > svc/holds | 4 ++-- > t/Biblio2.t | 14 +++++++------- > tags/list.pl | 2 +- > tools/batch_delete_records.pl | 2 +- > 47 files changed, 87 insertions(+), 75 deletions(-) > >diff --git a/C4/Biblio.pm b/C4/Biblio.pm >index 53527879b6..ed0058619c 100644 >--- a/C4/Biblio.pm >+++ b/C4/Biblio.pm >@@ -67,7 +67,7 @@ BEGIN { > TransformHtmlToMarc > TransformHtmlToXml > prepare_host_field >- SplitSubtitle >+ SplitKohaField > ); > > # Internal functions >@@ -3458,20 +3458,23 @@ sub RemoveAllNsb { > return $record; > } > >-=head2 SplitSubtitle >+=head2 SplitKohaField > >- $subtitles = SplitSubtitle($subtitle); >+ $subtitles = SplitKohaField($biblio->subtitle()); > >-Splits a subtitle field to an array of hashes like the one GetRecordValue returns >+Splits a Koha field with multiple values to an array. Multiple matches for a >+Koha field (according to the bibliographic framework) are concatenated with >+' | ', but in many cases it's not optimal for display and an array is >+preferred. > > =cut > >-sub SplitSubtitle { >- my $subtitle = shift; >+sub SplitKohaField { >+ my $field = shift; > >- my @subtitles = map( { 'subfield' => $_ }, split(/ \| /, $subtitle // '' ) ); >+ my @parts = split(/ \| /, $field // '' ); > >- return \@subtitles; >+ return \@parts; > } > > 1; >diff --git a/C4/ShelfBrowser.pm b/C4/ShelfBrowser.pm >index b5d19799b6..05669fb94e 100644 >--- a/C4/ShelfBrowser.pm >+++ b/C4/ShelfBrowser.pm >@@ -223,7 +223,7 @@ sub GetShelfInfo { > my $this_biblio = GetBibData($item->{biblionumber}); > next unless defined $this_biblio; > $item->{'title'} = $this_biblio->{'title'}; >- $item->{'subtitle'} = C4::Biblio::SplitSubtitle($this_biblio->{'subtitle'}), >+ $item->{'subtitle'} = C4::Biblio::SplitKohaField($this_biblio->{'subtitle'}), > $item->{'medium'} = $this_biblio->{'medium'}; > $item->{'part_number'} = $this_biblio->{'part_number'}; > $item->{'part_name'} = $this_biblio->{'part_name'}; >diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl >index 8333b4723f..d1662c5454 100755 >--- a/acqui/neworderbiblio.pl >+++ b/acqui/neworderbiblio.pl >@@ -130,7 +130,7 @@ foreach my $result ( @{$marcresults} ) { > my $marcrecord = C4::Search::new_record_from_zebra( 'biblioserver', $result ); > my $biblio = TransformMarcToKoha( $marcrecord, '' ); > >- $biblio->{subtitles} = C4::Biblio::SplitSubtitle($biblio->{'subtitle'}); >+ $biblio->{subtitles} = C4::Biblio::SplitKohaField($biblio->{'subtitle'}); > $biblio->{booksellerid} = $booksellerid; > push @results, $biblio; > >diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl >index 15e68959fa..66eebd3ce1 100755 >--- a/circ/reserveratios.pl >+++ b/circ/reserveratios.pl >@@ -164,7 +164,7 @@ while ( my $data = $sth->fetchrow_hashref ) { > priority => $data->{priority}, > name => $data->{borrower}, > title => $data->{title}, >- subtitle => C4::Biblio::SplitSubtitle($data->{'subtitle'}); >+ subtitle => C4::Biblio::SplitKohaField($data->{'subtitle'}), > author => $data->{author}, > itemnum => $data->{itemnumber}, > biblionumber => $data->{biblionumber}, >diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl >index f1c09ef013..3734b3c935 100755 >--- a/circ/transferstoreceive.pl >+++ b/circ/transferstoreceive.pl >@@ -99,7 +99,7 @@ while ( my $library = $libraries->next ) { > %getransf = ( > %getransf, > title => $biblio->title, >- subtitle => C4::Biblio::SplitSubtitle($biblio->{'subtitle'}), >+ subtitle => C4::Biblio::SplitKohaField($biblio->{'subtitle'}), > medium => $biblio->medium, > part_number => $biblio->part_number, > part_name => $biblio->part_name, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 482185b33e..8abc2a8fbe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -50,7 +50,7 @@ > <tr> > <td> > <p><span class="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></span> >- [% FOREACH subtitle IN biblio.subtitles %] <span class="subtitle">[% subtitle.subfield | html %]</span>[% END %] >+ [% FOREACH subtitle IN biblio.subtitles %] <span class="subtitle">[% subtitle | html %]</span>[% END %] > [% IF ( biblio.author ) %] by <span class="author">[% biblio.author | html %]</span>,[% END %]</p> > <p>[% IF ( biblio.isbn ) %] [% biblio.isbn | html %][% END %] > [% IF ( biblio.pages ) %] - [% biblio.pages | html %][% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >index 9b926b4e1c..7274b0c651 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -56,8 +56,8 @@ div#result { margin-top: 1em; } > <fieldset class="rows"> > <legend>Merge reference</legend> > <ol> >- <li class="radio"><input type="radio" value="[% recordid1 | uri %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 | html %]')" /><label for="mergereference1">[% title1 | html %] [% FOREACH subtitl1 IN subtitle1 %] [% subtitl1.subfield | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | uri %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid1 | html %][% IF frameworklabel1 %] — [% frameworklabel1 | html %][% END %]</a>)</label></li> >- <li class="radio"><input type="radio" value="[% recordid2 | uri %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 | html %]')" /><label for="mergereference2">[% title2 | html %] [% FOREACH subtitl2 IN subtitle2 %] [% subtitl2.subfield | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid2 | uri %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid2 | html %][% IF frameworklabel2 %] — [% frameworklabel2 | html %][% END %]</a>)</label></li> >+ <li class="radio"><input type="radio" value="[% recordid1 | uri %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 | html %]')" /><label for="mergereference1">[% title1 | html %] [% FOREACH subtitl1 IN subtitle1 %] [% subtitl1 | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | uri %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid1 | html %][% IF frameworklabel1 %] — [% frameworklabel1 | html %][% END %]</a>)</label></li> >+ <li class="radio"><input type="radio" value="[% recordid2 | uri %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 | html %]')" /><label for="mergereference2">[% title2 | html %] [% FOREACH subtitl2 IN subtitle2 %] [% subtitl2 | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid2 | uri %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid2 | html %][% IF frameworklabel2 %] — [% frameworklabel2 | html %][% END %]</a>)</label></li> > > [% IF frameworkselect %] > <li><label for="frameworkcode">Using framework:</label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index d984665675..de1788c783 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -71,7 +71,7 @@ > <h3> > <input type="checkbox" class="select_record noprint" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]" /> > [% BIBLIO_RESULT.title |html %] >- [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %][% END %] >+ [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl | html %][% END %] > [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author | html %][% END %] > </h3> > <!-- COinS / Openurl --> >@@ -266,7 +266,7 @@ > <a href="[% BIBLIO_RESULT.dest | url %]?biblionumber=[% BIBLIO_RESULT.biblionumber | uri %]" class="open_title"> > [% BIBLIO_RESULT.title |html %] > [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] >- [% subtitl.subfield | html %] >+ [% subtitl | html %] > [% END %] > </a> > [% BIBLIO_RESULT.author | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 6520134dc2..ced2ea11a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -34,7 +34,7 @@ > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] >- Details for [% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %] >+ Details for [% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %] > [% END %] > </title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -49,7 +49,7 @@ > [% IF ( unknownbiblionumber ) %] > Unknown record > [% ELSE %] >- Details for <i>[% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %]</i> >+ Details for <i>[% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]</i> > [% END %] > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >index b5d95e7e10..cd4d35ee8a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/imageviewer.tt >@@ -2,7 +2,7 @@ > [% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Catalog › [% biblio.title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %] › Images</title> >+<title>Koha › Catalog › [% biblio.title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %] › Images</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > #largeCover { >@@ -27,7 +27,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i>[% biblio.title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %]</i></a> › Images</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]"><i>[% biblio.title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]</i></a> › Images</div> > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index 28066ce1ad..283d9257c8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -6,7 +6,7 @@ > [% USE Price %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Catalog › Item details for [% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %]</title> >+<title>Koha › Catalog › Item details for [% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style>h3{padding-top: 1em; border-top: 2px solid #CCCCCC;}#exportLabelexportModal_{border-top: 0px;}</style> > </head> >@@ -15,7 +15,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Item details for <i>[% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %]</i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Item details for <i>[% title | html %] [% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]</i></div> > > <div class="main container-fluid"> > <div class="row"> >@@ -27,7 +27,7 @@ > <div id="catalogue_detail_biblio"> > > <h2>[% title | html %]</h2> >- [% IF ( subtitle ) %]<h4>[% FOREACH subtitl IN subtitle %] [% subtitl.subfield | html %][% END %]</h4>[% END %] >+ [% IF ( subtitle ) %]<h4>[% FOREACH subtitl IN subtitle %] [% subtitl | html %][% END %]</h4>[% END %] > [% IF ( author ) %]<h4>by [% author | html %]</h4>[% END %] > <div class="rows"> > <ol class="bibliodetails"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >index b96de1ae7d..8ac04390be 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >@@ -12,7 +12,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Stock rotation details for <i>[% biblio.title | html %][% FOREACH subtitle IN biblio.subtitles %][% subtitle.subfield | html %][% END %]</i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Stock rotation details for <i>[% biblio.title | html %][% FOREACH subtitle IN biblio.subtitles %][% subtitle | html %][% END %]</i></div> > > <div class="main container-fluid"> > <div class="row"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index b11daa744f..cef6c3f0bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -76,7 +76,7 @@ > <td> > <p> > <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber | uri %]">[% resultsloo.title | html %]</a> >- [% FOREACH subtitl IN resultsloo.subtitle %][% subtitl.subfield | html %][% END %]</p> >+ [% FOREACH subtitl IN resultsloo.subtitle %][% subtitl | html %][% END %]</p> > [% IF ( resultsloo.summary ) %] > <p>[% resultsloo.summary | html %]</p> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index c21baca652..cfb813a542 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -101,7 +101,7 @@ div#result { margin-top: 1em; } > <label for="ref_biblionumber[% record.biblionumber | html %]"> > [% record.data.title | html %] > [% FOREACH subtitle IN record.subtitles %] >- [% subtitle.subfield | html %] >+ [% subtitle | html %] > [% END %] > ([% record.biblionumber | uri %]) <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% record.biblionumber | uri %]" class="previewData">View MARC</a> > </label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index 281eec1546..6717c0e038 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -117,7 +117,7 @@ > [% END %] > <td>[% checkout_info.barcode | html %]</td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.biblio.biblionumber | uri %]&type=intra"><strong>[% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle.subfield | html %][% END %]</strong></a>[% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes | html %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.biblio.biblionumber | html %]&itemnumber=[% checkout_info.item.itemnumber | html %]#item[% checkout_info.item.itemnumber | html %]">[% checkout_info.item.barcode | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.biblio.biblionumber | uri %]&type=intra"><strong>[% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle | html %][% END %]</strong></a>[% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes | html %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.biblio.biblionumber | html %]&itemnumber=[% checkout_info.item.itemnumber | html %]#item[% checkout_info.item.itemnumber | html %]">[% checkout_info.item.barcode | html %]</a> > </td> > <td> > [% IF checkout_info.NEEDSCONFIRMATION %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index 588801600b..eac912a4a2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -57,7 +57,7 @@ > <td><p>[% reserveloo.reservecount | html %]</p></td> > <td><p>[% reserveloo.itemcount | html %]</p></td> > <td><a href="#" class="ratiolimit">[% reserveloo.thisratio | html %]</a></td> >- <td> [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title | html %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl.subfield | html %][% END %][% END %]</a>[% IF ( reserveloo.author ) %] by [% reserveloo.author | html %][% END %] >+ <td> [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title | html %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl | html %][% END %][% END %]</a>[% IF ( reserveloo.author ) %] by [% reserveloo.author | html %][% END %] > </td> > <td> > <ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index 8563488eb2..9705432f94 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -52,7 +52,7 @@ > [% END %] > <td><p><span title="[% reser.datetransfer | html %]">[% reser.datetransfer | $KohaDates %]</span></p> [% IF ( reser.messcompa ) %]<span class="error">Transfer is [% reser.diff | html %] days late</span>[% END %]</td> > <td> >- [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% reser.title | html %] [% IF ( reser.subtitle ) %] [% FOREACH subtitl IN reser.subtitle %][% subtitl.subfield | html %][% END %][% END %]</a> [% IF ( reser.author ) %]by [% reser.author | html %][% END %] >+ [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% reser.title | html %] [% IF ( reser.subtitle ) %] [% FOREACH subtitl IN reser.subtitle %][% subtitl | html %][% END %][% END %]</a> [% IF ( reser.author ) %]by [% reser.author | html %][% END %] > [% IF ( reser.itemtype ) %] (<b>[% reser.itemtype | html %]</b>)[% END %] > <br />Barcode: [% reser.barcode | html %] > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index f11f0cffff..560367d796 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -58,7 +58,7 @@ > [% END %] > > [% UNLESS ( multi_hold ) %] >- <h1>Place a hold on [% INCLUDE 'biblio-default-view.inc' %][% title | html %]</a></h1> >+ <h1>Place a hold on [% INCLUDE 'biblio-default-view.inc' %][% title | html %]</a> [% subtitle | html %] [% part_number | html %] [% part_name | html %]</h1> > [% ELSE %] > <h1>Confirm holds</h1> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >index 6405c85755..1d0e55b921 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -31,7 +31,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > > [% FOREACH title IN titles %] > <tr> >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = title.biblionumber %][% title.title | html %][% FOREACH subtitl IN title.subtitle %] [% subtitl.subfield | html %][% END %]</a> >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = title.biblionumber %][% title.title | html %][% FOREACH subtitl IN title.subtitle %] [% subtitl | html %][% END %]</a> > [% title.author | html %] > <p>[% IF ( title.publishercode ) %]- [% title.publishercode | html %] > [% IF ( title.place ) %] [% title.place | html %][% END %][% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index 50040559ce..d2d23723ba 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >@@ -152,7 +152,7 @@ > <tr> > <td><input type="checkbox" name="record_id" id="record_id_[% biblio.biblionumber | html %]" value="[% biblio.biblionumber | html %]" data-items="[% biblio.itemnumbers.size | html %]" data-issues="[% biblio.issues_count | html %]" data-reserves="[% biblio.holds_count | html %]" /></td> > <td><label for="record_id_[% biblio.biblionumber | html %]">[% biblio.biblionumber | html %]</label></td> >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber=biblio.biblionumber %][% biblio.title | html %][% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle %] [% subtitle.subfield | html %][% END %][% END %]</a></td> >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber=biblio.biblionumber %][% biblio.title | html %][% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle %] [% subtitle | html %][% END %][% END %]</a></td> > <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.itemnumbers.size | html %]</a></td> > <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.holds_count | html %]</a></td> > <td><a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.issues_count | html %]</a></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt >index 39ae699d77..fa56105e78 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt >@@ -33,7 +33,7 @@ Your list: [% shelfname | $raw %] > [% BIBLIO_RESULT.title | $raw %] > [% IF ( BIBLIO_RESULT.subtitle.size ) %] > [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %] >- [% subtitle.subfield | $raw %] >+ [% subtitle | $raw %] > [% END %] > [% END %] > </span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 023922a873..9d553cc8e8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -212,7 +212,7 @@ > [% itemsloo.XSLTBloc | $raw %] > [% ELSE %] > [% INCLUDE 'biblio-default-view.inc' biblionumber = itemsloo.biblionumber %] >- [% itemsloo.title | html %][% FOREACH subtitl IN itemsloo.subtitle %] [% subtitl.subfield | html %][% END %]</a> >+ [% itemsloo.title | html %][% FOREACH subtitl IN itemsloo.subtitle %] [% subtitl | html %][% END %]</a> > [% END %] > <p class="hold"> > [% IF ( itemsloo.notforloan ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >index 4fbaea60d9..f04c06958e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js >@@ -240,9 +240,11 @@ $(document).ready(function() { > + oObj.title.escapeHtml(); > > $.each(oObj.subtitle, function( index, value ) { >- title += " " + value.subfield.escapeHtml(); >+ title += " " + value.escapeHtml(); > }); > >+ title += " " + oObj.part_number + " " + oObj.part_name; >+ > if ( oObj.enumchron ) { > title += " (" + oObj.enumchron.escapeHtml() + ")"; > } >@@ -595,9 +597,11 @@ $(document).ready(function() { > + oObj.title.escapeHtml(); > > $.each(oObj.subtitle, function( index, value ) { >- title += " " + value.subfield.escapeHtml(); >+ title += " " + value.escapeHtml(); > }); > >+ title += " " + oObj.part_number + " " + oObj.part_name; >+ > if ( oObj.enumchron ) { > title += " (" + oObj.enumchron.escapeHtml() + ")"; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js >index 1ca9a627c9..bf85855130 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js >@@ -25,9 +25,11 @@ $(document).ready(function() { > + oObj.title.escapeHtml(); > > $.each(oObj.subtitle, function( index, value ) { >- title += " " + value.subfield.escapeHtml(); >+ title += " " + value.escapeHtml(); > }); > >+ title += " " + oObj.part_number + " " + oObj.part_name; >+ > title += "</a>"; > > if ( oObj.author ) { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >index 276c0d2d5c..2808e255fb 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >@@ -81,7 +81,7 @@ > [% item.title | html %] > [% FOREACH subtitl IN item.subtitle %] > [% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] >- [% subtitl.subfield | html %] >+ [% subtitl | html %] > [% END %] > </a> > </td> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >index 64628894c2..292282ef33 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >@@ -68,7 +68,7 @@ > <h3> > <input type="checkbox" class="cb" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]"> > [% BIBLIO_RESULT.title | html %] >- [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl.subfield | html %] [% END %][% END %] >+ [% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] [% subtitl | html %] [% END %][% END %] > [% IF ( BIBLIO_RESULT.author ) %] [% BIBLIO_RESULT.author | html %][% END %] > </h3> > <!-- COinS / Openurl --> >@@ -257,7 +257,7 @@ > <input type="checkbox" class="cb" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]"> > </td> > <td> >- <a href="#" onclick="openBiblio('[% BIBLIO_RESULT.dest | html %]',[% BIBLIO_RESULT.biblionumber | html %])">[% BIBLIO_RESULT.title | html %][% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %][% subtitl.subfield | html %][% END %][% END %]</a> >+ <a href="#" onclick="openBiblio('[% BIBLIO_RESULT.dest | html %]',[% BIBLIO_RESULT.biblionumber | html %])">[% BIBLIO_RESULT.title | html %][% IF ( BIBLIO_RESULT.subtitle ) %] [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %][% subtitl | html %][% END %][% END %]</a> > <!-- COinS / Openurl --> > <span class="Z3988" title="ctx_ver=Z39.88-2004&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&rft.au=[% BIBLIO_RESULT.author | html %]&rft.btitle=[% BIBLIO_RESULT.title |url %]&rft.date=[% BIBLIO_RESULT.publicationyear | html %]&rft.tpages=[% BIBLIO_RESULT.item('size') | html %]&rft.isbn=[% BIBLIO_RESULT.isbn |url %]&rft.aucorp=&rft.place=[% BIBLIO_RESULT.place | html %]&rft.pub=[% BIBLIO_RESULT.publisher |url %]&rft.edition=[% BIBLIO_RESULT.edition | html %]&rft.series=[% BIBLIO_RESULT.series | html %]&rft.genre="></span> > [% IF ( TagsInputEnabled && loggedinusername ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >index 7d25cde9db..5863fb2466 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -30,7 +30,7 @@ > [% END %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Details for: [% title | html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl.subfield | html %][% END %]</title> >+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Details for: [% title | html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl | html %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("lib/emoji-picker/css/emoji.css") | $raw %] > </head> >@@ -41,7 +41,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="#"><span>Details for: </span>[% title | html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl.subfield | html %][% END %]</a></li> >+ <li><a href="#"><span>Details for: </span>[% title | html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl | html %][% END %]</a></li> > </ul> > > <div class="container-fluid"> >@@ -112,7 +112,7 @@ > [% IF ( OPACXSLTDetailsDisplay ) %] > [% XSLTBloc | $raw %] > [% ELSE %] >- <h1 class="title">[% title | html %][% IF ( subtitle ) %] <span class="subtitle">[% FOREACH subtitl IN subtitle %][% subtitl.subfield | html %] [% END %]</span>[% END %]</h1> >+ <h1 class="title">[% title | html %][% IF ( subtitle ) %] <span class="subtitle">[% FOREACH subtitl IN subtitle %][% subtitl | html %] [% END %]</span>[% END %]</h1> > [% IF ( author ) %]<h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% author |url %]">[% author | html %]</a></h5>[% END %] > > <span class="results_summary">[% UNLESS ( item_level_itypes ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >index b91b6b7a99..eac730a770 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >@@ -37,7 +37,7 @@ > <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | $raw %][% SEARCH_RESULT.limit_cgi | url %]&sort_by=[% SEARCH_RESULT.sort_by |uri %]&format=opensearchdescription"/> > <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc |uri %][% SEARCH_RESULT.limit_desc |uri %]" startPage="[% SEARCH_RESULT.page | html %]" /> > <item> >- <title>[% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]</title> >+ <title>[% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl | html %][% END %]</title> > <dc:identifier>ISBN [% SEARCH_RESULT.isbn | html %]</dc:identifier> > <link>[% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% END %][% END %]</link> > <description><![CDATA[ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >index 5a880b2a73..05714c5b39 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >@@ -137,11 +137,11 @@ > </td> > <td> > [% IF issue.BiblioDefaultViewmarc %] >- <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title | html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield | html %][% END %][% END %]</a> >+ <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title | html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl | html %][% END %][% END %]</a> > [% ELSIF issue.BiblioDefaultViewisbd %] >- <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title | html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield | html %][% END %][% END %]</a> >+ <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title | html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl | html %][% END %][% END %]</a> > [% ELSE %] >- <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title | html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl.subfield | html %][% END %][% END %]</a> >+ <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% issue.biblionumber |url %]">[% issue.title | html %] [% IF issue.subtitle %][% FOREACH subtitl IN issue.subtitle %][% subtitl | html %][% END %][% END %]</a> > [% END %] > <p class="results-summary item-details">[% issue.author | html %]</p> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >index b26fbaf99d..b191ddc4d6 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt >@@ -172,7 +172,7 @@ > [% bibitemloo.title | html %] > [% IF ( bibitemloo.subtitle ) %] > [% FOREACH subtitl IN bibitemloo.subtitle %] >- [% subtitl.subfield | html %] >+ [% subtitl | html %] > [% END %] > [% END %] > </a> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >index 31194b9d97..e727ba38ae 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt >@@ -111,7 +111,7 @@ > </td> > <td> > [% FOREACH subtitl IN SEARCH_RESULT.subtitle %] >- [% subtitl.subfield | html %] >+ [% subtitl | html %] > [% END %] > </td> > </tr> >@@ -185,7 +185,7 @@ > <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% GROUP_RESULT.biblionumber |url %]" title="View details for this title">[% GROUP_RESULT.title | html %] > [% END %] > [% FOREACH subtitl IN GROUP_RESULT.subtitle %] >- [% subtitl.subfield | html %] >+ [% subtitl | html %] > [% END %] > </a> > [% END # / IF GROUP_RESULT.BiblioDefaultViewmarc %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >index e6bd51b2d9..b57b5febbe 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -356,7 +356,7 @@ > [% END %] > > [% FOREACH subtitl IN SEARCH_RESULT.subtitle %] >- , [% subtitl.subfield | html %] >+ , [% subtitl | html %] > [% END %]</a> > > [% IF ( SEARCH_RESULT.author ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt >index 97b2946416..eac41dd01b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelf.tt >@@ -34,7 +34,7 @@ Your list : [% shelfname | $raw %] > [% BIBLIO_RESULT.title | $raw %] > [% IF ( BIBLIO_RESULT.subtitle.size ) %] > [% FOREACH subtitle IN BIBLIO_RESULT.subtitle %] >- [% subtitle.subfield | $raw %] >+ [% subtitle | $raw %] > [% END %] > [% END %] > </span> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >index 10d452da36..6e35d29c51 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -380,7 +380,7 @@ > [% END %] > > [% FOREACH subtitl IN itemsloo.subtitle %] >- [% subtitl.subfield | html %] >+ [% subtitl | html %] > [% END %] > </a> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >index 5d199c4514..12e32537c1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >@@ -10,7 +10,7 @@ > [% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %] > [% FOREACH review IN reviews %] > <item> >- <title>New comment on [% review.title | html %] [% FOREACH subtitl IN review.subtitle %], [% subtitl.subfield | html %][% END %]</title> >+ <title>New comment on [% review.title | html %] [% FOREACH subtitl IN review.subtitle %], [% subtitl | html %][% END %]</title> > <link>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber | html %]#comments</link> > <description><![CDATA[ > [% IF ( AdlibrisEnabled && review.normalized_isbn ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >index e510e1aab4..3dd3d875a3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >@@ -47,7 +47,7 @@ > [% END %] > [% END %] > [% IF ( review.title ) %][% review.title | html %][% ELSE %]No title[% END %] >- [% FOREACH subtitl IN review.subtitle %] [% subtitl.subfield | html %][% END %] >+ [% FOREACH subtitl IN review.subtitle %] [% subtitl | html %][% END %] > </a> > [% IF ( review.author ) %] > by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% review.author |url %]" title="Search for works by this author" class="author">[% review.author | html %]</a> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >index 08b5528ba0..49b48621c3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >@@ -152,7 +152,7 @@ > [% MY_TAG.title | html %] > [% IF ( MY_TAG.subtitle ) %] > [% FOREACH subtitle IN MY_TAG.subtitle %] >- [% subtitle.subfield | html %] >+ [% subtitle | html %] > [% END %] > [% END %] > </a> >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 12aad6bbe0..b761034279 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -248,7 +248,7 @@ > </td>[% END # / IF JacketImages %] > > <td class="title"> >- <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber | html %]">[% ISSUE.title | html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield | html %][% END %]</a> >+ <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber | html %]">[% ISSUE.title | html %] [% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl | html %][% END %]</a> > [% IF ( ISSUE.enumchron ) %] [% ISSUE.enumchron | html %][% END %] > </td> > >@@ -520,7 +520,7 @@ > [% END # /IF jacketcell %] > > <td> >- <a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber | html %]">[% OVERDUE.title | html %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield | html %][% END %] >+ <a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber | html %]">[% OVERDUE.title | html %] [% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl | html %][% END %] > </a> > <span class="item-details">[% OVERDUE.author | html %]</span></td> > >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index fa8371694b..7e47ac821e 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -424,7 +424,7 @@ foreach my $biblioNum (@biblionumbers) { > my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} ); > $biblioLoopIter{biblionumber} = $biblioData->{biblionumber}; > $biblioLoopIter{title} = $biblioData->{title}; >- $biblioLoopIter{subtitle} = C4::Biblio::SplitSubtitle($biblioData->{'subtitle'}); >+ $biblioLoopIter{subtitle} = C4::Biblio::SplitKohaField($biblioData->{'subtitle'}); > $biblioLoopIter{medium} = $biblioData->{medium}; > $biblioLoopIter{part_number} = $biblioData->{part_number}; > $biblioLoopIter{part_name} = $biblioData->{part_name}; >diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl >index f9f2f9c423..4f8f4a38cc 100755 >--- a/opac/opac-tags.pl >+++ b/opac/opac-tags.pl >@@ -257,7 +257,7 @@ if ($loggedinuser) { > } > next if ( $should_hide && scalar @all_items == scalar @hidden_itemnumbers ); > $tag->{title} = $biblio->title; >- $tag->{subtitle} = C4::Biblio::SplitSubtitle($biblio->subtitle); >+ $tag->{subtitle} = C4::Biblio::SplitKohaField($biblio->subtitle); > $tag->{medium} = $biblio->medium; > $tag->{part_number} = $biblio->part_number; > $tag->{part_name} = $biblio->part_name; >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index dd77be9f75..9f73c06fed 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -201,7 +201,7 @@ if ( $pending_checkouts->count ) { # Useless test > ); > $issue->{rentalfines} = $rental_fines->total_outstanding; > >- $issue->{'subtitle'} = C4::Biblio::SplitSubtitle($issue->{'subtitle'}); >+ $issue->{'subtitle'} = C4::Biblio::SplitKohaField($issue->{'subtitle'}); > > # check if item is renewable > my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} ); >diff --git a/reserve/request.pl b/reserve/request.pl >index df9cae861d..687d287d5b 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -640,6 +640,9 @@ foreach my $biblionumber (@biblionumbers) { > biblionumber => $biblionumber, > findborrower => $findborrower, > title => $biblio->title, >+ subtitle => $biblio->subtitle, >+ part_number => $biblio->part_number, >+ part_name => $biblio->part_name, > author => $biblio->author, > holdsview => 1, > C4::Search::enabled_staff_search_views, >diff --git a/svc/checkouts b/svc/checkouts >index 8aecac1cb0..7eb2f87ba7 100755 >--- a/svc/checkouts >+++ b/svc/checkouts >@@ -23,7 +23,7 @@ use CGI; > use JSON qw(to_json); > > use C4::Auth qw(check_cookie_auth haspermission get_session); >-use C4::Biblio qw(SplitSubtitle); >+use C4::Biblio qw(SplitKohaField); > use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate); > use C4::Overdues qw(GetFine); > use C4::Context; >@@ -178,7 +178,7 @@ while ( my $c = $sth->fetchrow_hashref() ) { > my $checkout = { > DT_RowId => $c->{itemnumber} . '-' . $c->{borrowernumber}, > title => $c->{title}, >- subtitle => C4::Biblio::SplitSubtitle($c->{'subtitle'}), >+ subtitle => C4::Biblio::SplitKohaField($c->{'subtitle'}), > medium => $c->{medium} // '', > part_number => $c->{part_number} // '', > part_name => $c->{part_name} // '', >diff --git a/svc/holds b/svc/holds >index 8b9a27b310..2368a51e1a 100755 >--- a/svc/holds >+++ b/svc/holds >@@ -23,7 +23,7 @@ use CGI; > use JSON qw(to_json); > > use C4::Auth qw(check_cookie_auth); >-use C4::Biblio qw(SplitSubtitle); >+use C4::Biblio qw(SplitKohaField); > use C4::Charset; > use C4::Circulation qw(GetTransfers); > use C4::Context; >@@ -90,7 +90,7 @@ while ( my $h = $holds_rs->next() ) { > DT_RowId => $h->reserve_id(), > biblionumber => $biblionumber, > title => $biblio->title(), >- subtitle => $biblio->subtitle() // '', >+ subtitle => C4::Biblio::SplitKohaField($biblio->subtitle()), > medium => $biblio->medium() // '', > part_number => $biblio->part_number() // '', > part_name => $biblio->part_name() // '', >diff --git a/t/Biblio2.t b/t/Biblio2.t >index 21354eb578..bf78de9732 100644 >--- a/t/Biblio2.t >+++ b/t/Biblio2.t >@@ -52,20 +52,20 @@ sub _koha_marc_update_bib_ids_control { > is($r->field('004')->data(), 20, 'Biblioitemnumber to control field'); > } > >-subtest 'SplitSubtitle' => sub { >+subtest 'SplitKohaField' => sub { > plan tests => 4; > >- my $res = C4::Biblio::SplitSubtitle(undef); >+ my $res = C4::Biblio::SplitKohaField(undef); > is_deeply($res, [], 'undef returned as an array'); > >- $res = C4::Biblio::SplitSubtitle(''); >+ $res = C4::Biblio::SplitKohaField(''); > is_deeply($res, [], 'Empty string returned as an array'); > >- $res = C4::Biblio::SplitSubtitle('Single'); >- is_deeply($res, [{'subfield' => 'Single'}], 'Single subtitle returns an array'); >+ $res = C4::Biblio::SplitKohaField('Single'); >+ is_deeply($res, ['Single'], 'Single subtitle returned as an array'); > >- $res = C4::Biblio::SplitSubtitle('First | Second'); >- is_deeply($res, [{'subfield' => 'First'}, {'subfield' => 'Second'}], 'Two subtitles returns an array'); >+ $res = C4::Biblio::SplitKohaField('First | Second'); >+ is_deeply($res, ['First', 'Second'], 'Two subtitles returned as an array'); > }; > > done_testing(); >diff --git a/tags/list.pl b/tags/list.pl >index 6f39da509e..9a7369c7df 100755 >--- a/tags/list.pl >+++ b/tags/list.pl >@@ -61,7 +61,7 @@ else { > my $taglist = get_tag_rows( { term => $tag } ); > for ( @{$taglist} ) { > my $dat = &GetBiblioData( $_->{biblionumber} ); >- $dat->{'subtitle'} = C4::Biblio::SplitSubtitles($dat->{'subtitle'}), >+ $dat->{'subtitle'} = C4::Biblio::SplitKohaFields($dat->{'subtitle'}), > my @items = GetItemsInfo( $_->{biblionumber} ); > $dat->{biblionumber} = $_->{biblionumber}; > $dat->{tag_id} = $_->{tag_id}; >diff --git a/tools/batch_delete_records.pl b/tools/batch_delete_records.pl >index 9eba7354a4..bcb70fbecb 100755 >--- a/tools/batch_delete_records.pl >+++ b/tools/batch_delete_records.pl >@@ -94,7 +94,7 @@ if ( $op eq 'form' ) { > my $holds_count = $biblio->holds->count; > $biblio = $biblio->unblessed; > my $record = &GetMarcBiblio({ biblionumber => $record_id }); >- $biblio->{subtitle} = C4::Biblio::SplitSubtitle( $biblio->{subtitle} ); >+ $biblio->{subtitle} = C4::Biblio::SplitKohaField( $biblio->{subtitle} ); > $biblio->{itemnumbers} = [Koha::Items->search({ biblionumber => $record_id })->get_column('itemnumber')]; > $biblio->{holds_count} = $holds_count; > $biblio->{issues_count} = C4::Biblio::CountItemsIssued( $record_id ); >-- >2.17.1
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 11529
:
81930
|
81931
|
82024
|
82025
|
82026
|
82027
|
82028
|
82029
|
82088
|
82089
|
82090
|
82428
|
82429
|
82430
|
82431
|
82538
|
82539
|
82540
|
82541
|
82542
|
83103
|
83104
|
83105
|
83106
|
83107
|
83108
|
83961
|
83962
|
83963
|
83964
|
83965
|
83966
|
85587
|
85588
|
85589
|
85590
|
85591
|
85592
|
86677
|
86678
|
86679
|
86680
|
86681
|
86682
|
87248
|
87249
|
87250
|
87251
|
87252
|
87253
|
87256
|
87257
|
87258
|
87259
|
87260
|
87261
|
87911
|
87912
|
87913
|
87914
|
87915
|
87916
|
87917
|
87918
|
87919
|
88247
|
88248
|
88249
|
88250
|
88251
|
88252
|
88253
|
88254
|
88255
|
88256
|
88406
|
88407
|
88408
|
88409
|
88410
|
88411
|
88412
|
88413
|
88414
|
88415
|
88416
|
88433
|
88434
|
88435
|
88436
|
88437
|
88438
|
88439
|
88440
|
88441
|
88442
|
88443
|
88762
|
88763
|
88764
|
88765
|
88766
|
88767
|
88768
|
88769
|
88770
|
88771
|
88772
|
88851
|
88852
|
88853
|
88854
|
88855
|
88856
|
88857
|
88858
|
88859
|
88860
|
88861
|
88862
|
89096
|
89097
|
89098
|
89099
|
89100
|
89101
|
89102
|
89103
|
89104
|
89105
|
89106
|
89107
|
89234
|
89235
|
89236
|
89237
|
89238
|
89239
|
89240
|
89241
|
89242
|
89243
|
89244
|
89245
|
89246
|
91680
|
91681
|
91682
|
91683
|
91684
|
91685
|
91686
|
91687
|
91688
|
91689
|
91690
|
91691
|
91692
|
91824
|
91825
|
91826
|
91827
|
91828
|
91829
|
91830
|
91831
|
91832
|
91833
|
91834
|
91835
|
91836
|
91837
|
92016
|
92019
|
92020
|
105667
|
105672