Bugzilla – Attachment 12630 Details for
Bug 8581
Authority display doesn't like GND records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[3.8.x] Bug 8581: don't display parentheses when we don't have a type
38x-Bug-8581-dont-display-parentheses-when-we-dont.patch (text/plain), 6.26 KB, created by
Jared Camins-Esakov
on 2012-10-02 12:46:12 UTC
(
hide
)
Description:
[3.8.x] Bug 8581: don't display parentheses when we don't have a type
Filename:
MIME Type:
Creator:
Jared Camins-Esakov
Created:
2012-10-02 12:46:12 UTC
Size:
6.26 KB
patch
obsolete
>From fa6b88d4da40a341b79e72d60f8fa632df8b62b0 Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@cpbibliography.com> >Date: Mon, 6 Aug 2012 14:04:32 -0400 >Subject: [PATCH] [3.8.x] Bug 8581: don't display parentheses when we don't have a type > >Prior to this patch, see also references in certain authority records >(most notably GND records) were being followed by empty parentheses in >the search results display. This patch resolves that problem. > >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> >Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> >Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> >--- > .../en/includes/authorities-search-results.inc | 22 ++++++++++---------- > .../en/includes/authorities-search-results.inc | 22 ++++++++++---------- > 2 files changed, 22 insertions(+), 22 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc >index 3defe48..2fc9e44 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc >@@ -2,19 +2,19 @@ > [% IF marcflavour == 'UNIMARC' %] > [% SWITCH type %] > [% CASE 'broader' %] >- <span class="BT">[% heading %]</span> -- >+ <span class="BT">[% heading | html %]</span> -- > [% CASE 'narrower' %] >- <span class="NT">[% heading %]</span> -- >+ <span class="NT">[% heading | html %]</span> -- > [% CASE 'narrower' %] >- <span class="NT">[% heading %]</span> -- >+ <span class="NT">[% heading | html %]</span> -- > [% CASE 'seefrom' %] >- <span class="UF">[% heading %]</span> -- >+ <span class="UF">[% heading | html %]</span> -- > [% CASE 'seealso' %] >- <span class="RT">[% heading %]</span> -- >+ <span class="RT">[% heading | html %]</span> -- > [% END %] > [% ELSE %] >- [% IF ( label ) %]<span class="label">[% label %]</span>[% END %] >- <span class="heading">[% heading %]</span> >+ [% IF ( label ) %]<span class="label">[% label | html %]</span>[% END %] >+ <span class="heading">[% heading | html %]</span> > [% UNLESS ( type=='seefrom' || type=='seealso' ) %]<span class="type">[% SWITCH type %] > [% CASE 'earlier' %](Earlier heading) > [% CASE 'later' %](Later heading) >@@ -22,19 +22,19 @@ > [% CASE 'musical' %](Musical composition) > [% CASE 'broader' %](Broader heading) > [% CASE 'narrower' %](Narrower heading) >- [% CASE %]([% type %]) >+ [% CASE %][% IF type %]([% type | html %])[% END %] > [% END %]</span>[% END %] > [% END %] > [% END %] > [% BLOCK authresult %] >- [% IF ( summary.summary ) %][% summary.summary %]:[% END %] >+ [% IF ( summary.summary ) %][% summary.summary | html %]:[% END %] > [% UNLESS ( summary.summaryonly ) %] > [% FOREACH authorize IN summary.authorized %] >- <span class="authorizedheading">[% authorize.heading %]</span> >+ <span class="authorizedheading">[% authorize.heading | html %]</span> > [% END %] > [% IF ( marcflavour == 'UNIMARC' ) %] > [% FOREACH note IN summary.notes %] >- <span class="note">[% note %]</span> >+ <span class="note">[% note | html %]</span> > [% END %] > [% FOREACH seefro IN summary.seefrom %] > [% PROCESS showreference heading=seefro.heading label="" type=seefro.type %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc >index 3defe48..2fc9e44 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc >+++ b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc >@@ -2,19 +2,19 @@ > [% IF marcflavour == 'UNIMARC' %] > [% SWITCH type %] > [% CASE 'broader' %] >- <span class="BT">[% heading %]</span> -- >+ <span class="BT">[% heading | html %]</span> -- > [% CASE 'narrower' %] >- <span class="NT">[% heading %]</span> -- >+ <span class="NT">[% heading | html %]</span> -- > [% CASE 'narrower' %] >- <span class="NT">[% heading %]</span> -- >+ <span class="NT">[% heading | html %]</span> -- > [% CASE 'seefrom' %] >- <span class="UF">[% heading %]</span> -- >+ <span class="UF">[% heading | html %]</span> -- > [% CASE 'seealso' %] >- <span class="RT">[% heading %]</span> -- >+ <span class="RT">[% heading | html %]</span> -- > [% END %] > [% ELSE %] >- [% IF ( label ) %]<span class="label">[% label %]</span>[% END %] >- <span class="heading">[% heading %]</span> >+ [% IF ( label ) %]<span class="label">[% label | html %]</span>[% END %] >+ <span class="heading">[% heading | html %]</span> > [% UNLESS ( type=='seefrom' || type=='seealso' ) %]<span class="type">[% SWITCH type %] > [% CASE 'earlier' %](Earlier heading) > [% CASE 'later' %](Later heading) >@@ -22,19 +22,19 @@ > [% CASE 'musical' %](Musical composition) > [% CASE 'broader' %](Broader heading) > [% CASE 'narrower' %](Narrower heading) >- [% CASE %]([% type %]) >+ [% CASE %][% IF type %]([% type | html %])[% END %] > [% END %]</span>[% END %] > [% END %] > [% END %] > [% BLOCK authresult %] >- [% IF ( summary.summary ) %][% summary.summary %]:[% END %] >+ [% IF ( summary.summary ) %][% summary.summary | html %]:[% END %] > [% UNLESS ( summary.summaryonly ) %] > [% FOREACH authorize IN summary.authorized %] >- <span class="authorizedheading">[% authorize.heading %]</span> >+ <span class="authorizedheading">[% authorize.heading | html %]</span> > [% END %] > [% IF ( marcflavour == 'UNIMARC' ) %] > [% FOREACH note IN summary.notes %] >- <span class="note">[% note %]</span> >+ <span class="note">[% note | html %]</span> > [% END %] > [% FOREACH seefro IN summary.seefrom %] > [% PROCESS showreference heading=seefro.heading label="" type=seefro.type %] >-- >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 8581
:
11391
|
11395
| 12630