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

Hide announcements when they have expired

Browse Source 
refs #11198
This commit is contained in:
Eric Lippmann 2016-12-13 11:01:19 +01:00
parent b75e24db91
commit a78ac6dfab
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/Icinga/Web/Announcement/AnnouncementIniRepository.php
View File

@ -152,11 +152,19 @@ class AnnouncementIniRepository extends IniRepository
{ {
$now = new DateTime(); $now = new DateTime();
$query = $this $query = $this
->select(array('start')) ->select(array('start', 'end'))
->setFilter(Filter::expression('start', '>', $now)) ->setFilter(Filter::matchAny(array(
->order('start') Filter::expression('start', '>', $now), Filter::expression('end', '>', $now)
->limit(1); )));
$nextActive = $query->fetchRow(); $refresh = null;
return $nextActive !== false ? $nextActive->start->getTimestamp() : null; foreach ($query as $row) {
$min = min($row->start->getTimestamp(), $row->end->getTimestamp());
if ($refresh === null) {
$refresh = $min;
} else {
$refresh = min($refresh, $min);
}
}
return $refresh;
} }
} }