From abd7a020b02dd51f0221291e2644ce2f9d5eb0fc Mon Sep 17 00:00:00 2001 From: Mason James Date: Mon, 16 Sep 2013 15:12:16 +1200 Subject: [PATCH] Bug 10825: don't display enum/chron twice for items received via the serials module TEST PLAN --------- 1) In the staff interface, display a bib that has one or more items that were received in the serials module. The following query can identify them: -- in MySQL: SELECT items.biblionumber,items.enumchron,serial.serialseq FROM items,serial,serialitems WHERE items.itemnumber=serialitems.itemnumber AND serialitems.serialid=serial.serialid; 2) Note that in the holdings tab, the serial enumeration/chronology is displayed twice. 3) Apply the patch 4) Refresh the screen 4) Now, the enum/chron should be displayed only once per item. 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. Signed-off-by: Galen Charlton (cherry picked from commit 3f5636cac39ca1109a73b40be08d9dbef096a17c) Signed-off-by: Fridolin Somers Signed-off-by: Kyle M Hall (cherry picked from commit 8ade958e84035b7132f2f9eb1837f137cc7937c6) --- .../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 882e342454..a83f4e36de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -512,11 +512,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 %] -- 2.39.5