Attachment 33012 Details for Bug 8296 – Bug 8296: Follow-up - don't display publisheddate when publisheddatetext is empty

[patch] Bug 8296: Follow-up - don't display publisheddate when publisheddatetext is empty

Bug-8296-Follow-up---dont-display-publisheddate-wh.patch (text/plain), 2.72 KB, created by Katrin Fischer on 2014-10-30 22:43:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-10-30 22:43:42 UTC

Size: 2.72 KB

patch

obsolete

>From 48475755c35e97d835f94bbc913651b9cd01c759 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Thu, 30 Oct 2014 23:18:50 +0100
>Subject: [PATCH] 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
>---
> .../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 17d9094..884f516 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
>@@ -249,16 +249,11 @@ $(document).ready(function() {
> 
> </td>
> <td>
>- [% publisheddatetext = serial.publisheddatetext || serial.publisheddate %]
>- 
>- [% IF serial.publisheddatetext %]
>- [% publisheddatetext %]
>- [% ELSIF serial.publisheddate %]
>- [% serial.publisheddate | $KohaDates %]
>- [% ELSE %]
>- Unknown
>- [% END %]
>- 
>+ [% IF serial.publisheddatetext %]
>+ 
>+ [% serial.publisheddatetext %]
>+ 
>+ [% END %]
> </td>
> <td>
> 
>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 8764c30..9d11e19 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
>@@ -274,7 +274,7 @@ $(document).ready(function() {
> [% END %]
> </td>
> <td>
>- [% serialslis.publisheddatetext || serialslis.publisheddate %]
>+ [% serialslis.publisheddatetext %]
> </td>
> <td>
> [% IF ( serialslis.status1 ) %]Expected[% END %]
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 8296: 10435 | 10582 | 11552 | 12228 | 12229 | 12230 | 12233 | 12240 | 13079 | 13080 | 13081 | 16315 | 16316 | 16317 | 16406 | 16420 | 16421 | 16422 | 18796 | 18797 | 18798 | 18811 | 18812 | 18813 | 19860 | 21341 | 21342 | 21343 | 21344 | 22727 | 22728 | 22729 | 22730 | 28974 | 28975 | 28976 | 28977 | 30379 | 30380 | 30381 | 30382 | 30383 | 30483 | 30484 | 30485 | 32124 | 32903 | 32904 | 32905 | 32906 | 32907 | 32908 | 33006 | 33007 | 33008 | 33009 | 33010 | 33011 | 33012 | 35865 | 35866 | 35867 | 35868 | 35869 | 35870 | 35871 | 41830 | 41831 | 41832 | 41833 | 41834 | 41835 | 41836 | 43665 | 43666 | 43667 | 43668 | 43669 | 43670 | 43671 | 45469