From 398d7f5cf649e507ba84d4b8422307259f0d2272 Mon Sep 17 00:00:00 2001 From: Mason James Date: Mon, 16 Sep 2013 15:12:16 +1200 Subject: [PATCH] [PASSED QA] Bug 10825 - detail.tt displays duplicated enumchron values for serial items TEST PLAN --------- 1) Find a data point that displays like the picture on this bug report. -- in MySQL: SELECT items.biblionumber,items.enumchron,serial.serialseq FROM items,serial,serialitems WHERE items.itemnumber=serilaitems.itemnumber AND serialitems.serialid=serial.serialid; 2) Apply the patch 3) Refresh the screen 4) Does it look like the second picture now with the duplication removed? 5) Run koha qa test tools I did attempt with default and blank for the XSLT system preferences for the staff client. This accounts for Nicole's comment #12. Signed-off-by: Mason James Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Works as described, passes tests and QA script. Template change only. --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 1e1fcd2..d09a3c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -658,11 +658,17 @@ function verify_images() { [% IF ( volinfo ) %] [% IF ( itemdata_enumchron ) %] - [% IF ( item.enumchron ) %] + [% IF item.enumchron && item.serialseq %] [% item.enumchron %] - [% IF ( item.serialseq ) %] -- [% END %] + [% IF ( item.serialseq && + item.enumchron!=item.serialseq ) %] + -- [% item.serialseq %] + [% END %] + [% ELSIF item.enumchron %] + [% item.enumchron %] + [% ELSIF item.serialseq %] + [% item.serialseq %] [% END %] - [% item.serialseq %] [% IF ( item.publisheddate ) %] ([% item.publisheddate %])[% END %] [% END %] -- 1.8.3.2