tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't render time information when the timestamp evaluates to false

Browse Source 
refs #6778
This commit is contained in:
Eric Lippmann 2015-05-18 14:40:55 +02:00
parent 9ffeffdf09
commit aaa8e4bf6a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/Icinga/Web/View/helpers/format.php
View File

@ -11,6 +11,9 @@ $this->addHelperFunction('format', function () {
}); });
$this->addHelperFunction('timeAgo', function ($timestamp) { $this->addHelperFunction('timeAgo', function ($timestamp) {
if (! $timestamp) {
return '';
}
return sprintf( return sprintf(
'<span class="time-ago" title="%s">%s</span>', '<span class="time-ago" title="%s">%s</span>',
date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
@ -19,6 +22,9 @@ $this->addHelperFunction('timeAgo', function ($timestamp) {
}); });
$this->addHelperFunction('timeSince', function ($timestamp) { $this->addHelperFunction('timeSince', function ($timestamp) {
if (! $timestamp) {
return '';
}
return sprintf( return sprintf(
'<span class="time-since" title="%s">%s</span>', '<span class="time-since" title="%s">%s</span>',
date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format
@ -27,7 +33,9 @@ $this->addHelperFunction('timeSince', function ($timestamp) {
}); });
$this->addHelperFunction('timeUntil', function ($timestamp) { $this->addHelperFunction('timeUntil', function ($timestamp) {
if (! $timestamp) return ''; if (! $timestamp) {
return '';
}
return sprintf( return sprintf(
'<span class="time-until" title="%s">%s</span>', '<span class="time-until" title="%s">%s</span>',
date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format date('Y-m-d H:i:s', $timestamp), // TODO: internationalized format