From 0e3f47caf94b2aa12c411659ec894da363f0636f Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 30 Oct 2014 23:18:50 +0100 Subject: [PATCH] [PASSED QA] Bug 8296: Follow-up - don't display publisheddate when publisheddatetext is empty To test: - make sure you have a subscription where only some fields have a published date (text) set - check the subscription detail page, issues tab - check the serial collection page - both pages should show an empty field, when published date (text) has not been set Signed-off-by: Julian Maurice Signed-off-by: Katrin Fischer --- .../prog/en/modules/serials/serials-collection.tt | 15 +++++---------- .../prog/en/modules/serials/subscription-detail.tt | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index 71bda64..bf1dc7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -253,16 +253,11 @@ $(document).ready(function() { - [% publisheddatetext = serial.publisheddatetext || serial.publisheddate %] - - [% IF serial.publisheddatetext %] - [% publisheddatetext %] - [% ELSIF serial.publisheddate %] - [% serial.publisheddate | $KohaDates %] - [% ELSE %] - Unknown - [% END %] - + [% IF serial.publisheddatetext %] + + [% serial.publisheddatetext %] + + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index b84f25d..dc0e246 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -297,7 +297,7 @@ $(document).ready(function() { [% END %] - [% serialslis.publisheddatetext || serialslis.publisheddate %] + [% serialslis.publisheddatetext %] [% IF ( serialslis.status1 ) %]Expected[% END %] -- 1.9.1