From 2940db88b0c3e90b9e4937daf295522c44e94030 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Sun, 10 Mar 2019 18:48:45 +0000 Subject: [PATCH] Conditional printing of only not null note rows. --- WEB-INF/lib/ttReportHelper.class.php | 2 +- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/report.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WEB-INF/lib/ttReportHelper.class.php b/WEB-INF/lib/ttReportHelper.class.php index 545fcc46..5e8f799f 100644 --- a/WEB-INF/lib/ttReportHelper.class.php +++ b/WEB-INF/lib/ttReportHelper.class.php @@ -956,7 +956,7 @@ class ttReportHelper { if ($options['show_timesheet']) $body .= ''.htmlspecialchars($record['timesheet']).''; $body .= ''; - if ($options['show_note']) { + if ($options['show_note'] && $record['note']) { $body .= ''; $body .= ''.$i18n->get('label.note').':'; $body .= ''.$record['note'].''; diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 6fe11c1f..64cc8dc1 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- {/if} {/if} - {if $bean->getAttribute('chnote')} + {if $bean->getAttribute('chnote') && $item.note} -- 2.20.1
 Anuko Time Tracker 1.18.57.4859 | Copyright © Anuko | +  Anuko Time Tracker 1.18.57.4860 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl index 51afd6ca..df122486 100644 --- a/WEB-INF/templates/report.tpl +++ b/WEB-INF/templates/report.tpl @@ -110,7 +110,7 @@ {if 2 == $item.type}
{$i18n.label.note}: {$item.note|escape}