Skip to content

Commit 01cf122

Browse files
committed
BaseGrid: Remove timeline specifics
Timeline is a separate implementation. Base grid is what it's name implies, a base implementation.
1 parent 4c3600e commit 01cf122

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

library/Notifications/Widget/TimeGrid/BaseGrid.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use DateInterval;
88
use DateTime;
99
use Generator;
10-
use Icinga\Module\Notifications\Widget\Timeline\FutureEntry;
1110
use ipl\Html\Attributes;
1211
use ipl\Html\BaseHtmlElement;
1312
use ipl\Html\HtmlElement;
@@ -422,20 +421,6 @@ final protected function yieldFixedEntries(Traversable $entries): Generator
422421
}
423422

424423
$rowStart = $position + $rowStartModifier;
425-
426-
if ($entry instanceof FutureEntry) {
427-
$gridArea = $this->getGridArea(
428-
$rowStart,
429-
$rowStart + 1,
430-
1,
431-
$gridBorderAt + 1
432-
);
433-
434-
yield $gridArea => $entry;
435-
436-
continue;
437-
}
438-
439424
if ($rowStart > $lastRow) {
440425
$lastRow = $rowStart;
441426
}

library/Notifications/Widget/Timeline.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,10 @@ public function getEntries(): Traversable
187187
}
188188

189189
if (! $entryFound && ! $this->minimalLayout) {
190-
yield (new FutureEntry())->setPosition($maxPriority - $rotation->getPriority());
190+
yield (new FutureEntry())
191+
->setStart($this->getGrid()->getGridStart())
192+
->setEnd($this->getGrid()->getGridEnd())
193+
->setPosition($maxPriority - $rotation->getPriority());
191194
}
192195
}
193196

0 commit comments

Comments
 (0)