From 01cc6b35ee1b503b635001059cb1e17c91725385 Mon Sep 17 00:00:00 2001 From: Mason James Date: Thu, 5 Sep 2013 17:36:51 +1200 Subject: [PATCH] Bug 10825 - detail.tt displays duplicated enumchron values for serial items Content-Type: text/plain; charset="utf-8" --- .../prog/en/modules/catalogue/detail.tt | 54 +++++++++++++++++--- 1 file changed, 46 insertions(+), 8 deletions(-) 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 1011224..9648e29 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -505,18 +505,21 @@ function verify_images() { [% item.datelastseen %] [% item.barcode %] + [% IF ( volinfo ) %] - [% IF ( itemdata_enumchron ) %] - [% IF ( item.enumchron ) %] - [% item.enumchron %] - [% IF ( item.serialseq ) %] -- [% END %] - [% END %] - [% item.serialseq %] - [% IF ( item.publisheddate ) %] ([% item.publisheddate %])[% END %] - [% END %] + [% IF ( itemloo.serialseq ) %] + [% itemloo.serialseq %] + [% ELSE %] + [% itemloo.enumchron %] + [% END %] + + [% IF ( itemloo.publisheddate ) %] + ([% itemloo.publisheddate %]) + [% END %] [% END %] + [% IF ( itemdata_uri ) %] [% item.uri %] [% END %] @@ -563,6 +566,41 @@ function verify_images() { [% END %] [% END %] +<<<<<<< HEAD +======= + [% itemloo.datelastseen %] + [% itemloo.barcode %] + + [% IF ( volinfo ) %] + + [% IF ( itemloo.serialseq ) %] + [% itemloo.serialseq %] + [% ELSE %] + [% itemloo.enumchron %] + [% END %] + + [% IF ( itemloo.publisheddate ) %] + ([% itemloo.publisheddate %]) + [% END %] + + [% END %] + + [% IF ( itemdata_uri ) %] + [% itemloo.uri %] + [% END %] + [% IF ( itemdata_copynumber ) %] + [% itemloo.copynumber %] + [% END %] + [% IF materials %] + [% itemloo.materials %] + [% END %] + [% IF ( itemdata_itemnotes ) %]
[% itemloo.itemnotes %]
[% END %] + [% IF ( SpineLabelShowPrintOnBibDetails ) %] + Print label + [% END %] + [% IF ( hostrecords ) %] + [% IF ( itemloo.hostbiblionumber) %][% itemloo.hosttitle %][% END %] +>>>>>>> 4439a53... Bug 10825 - detail.tt displays duplicated enumchron values for serial items [% END %] [% END %] -- 1.7.10.4