upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-06-09 00:32:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove showMore from contoller and create it through HistoryList class

Browse source
This commit is contained in:
Sukhwinder Dhillon 2021-08-23 11:43:54 +02:00
parent 78b9475137
commit 7fe9b33ee8
2 changed files with 10 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
application/controllers/HostController.php
View file

@ -23,7 +23,6 @@ use Icinga\Module\Icingadb\Widget\Detail\QuickActions;
use Icinga\Module\Icingadb\Widget\ItemList\HostList;
use Icinga\Module\Icingadb\Widget\ItemList\HistoryList;
use Icinga\Module\Icingadb\Widget\ItemList\ServiceList;
use Icinga\Module\Icingadb\Widget\ShowMore;
class HostController extends Controller
{
@ -131,7 +130,7 @@ class HostController extends Controller
}
$limitControl = $this->createLimitControl();
$url->setParam('limit', $limitControl->getLimit());
$history->peekAhead();
$history->limit($limitControl->getLimit());
if ($page > 1) {
@ -144,29 +143,18 @@ class HostController extends Controller
yield $this->export($history);
$results = $history->execute();
$showMore = (new ShowMore(
$results,
$url->setParam('page', $page + 1)
->setAnchor('page-' . ($page + 1))
))
->setLabel(t('Load More'))
->setAttribute('data-no-icinga-ajax', true);
$this->addControl((new HostList([$this->host]))->setViewMode('minimal'));
$this->addControl($limitControl);
$historyList = (new HistoryList($results))
->setPageSize($limitControl->getLimit());
$historyList = (new HistoryList($history->execute()))
->setPageSize($limitControl->getLimit())
->setLoadMoreUrl($url);
if ($compact) {
$historyList->setPageNumber($page);
}
// TODO: Dirty, really dirty, find a better solution (And I don't just mean `getContent()` !)
$historyList->add($showMore->setTag('li')->addAttributes(['class' => 'list-item']));
if ($compact && $page > 1) {
$this->document->add($historyList->getContent());
$this->document->addFrom($historyList);
} else {
$this->addContent($historyList);
}

22
application/controllers/ServiceController.php
View file

@ -19,7 +19,6 @@ use Icinga\Module\Icingadb\Widget\Detail\ServiceDetail;
use Icinga\Module\Icingadb\Widget\Detail\ServiceInspectionDetail;
use Icinga\Module\Icingadb\Widget\ItemList\HistoryList;
use Icinga\Module\Icingadb\Widget\ItemList\ServiceList;
use Icinga\Module\Icingadb\Widget\ShowMore;
class ServiceController extends Controller
{
@ -130,7 +129,7 @@ class ServiceController extends Controller
}
$limitControl = $this->createLimitControl();
$url->setParam('limit', $limitControl->getLimit());
$history->peekAhead();
$history->limit($limitControl->getLimit());
if ($page > 1) {
@ -143,29 +142,18 @@ class ServiceController extends Controller
yield $this->export($history);
$results = $history->execute();
$showMore = (new ShowMore(
$results,
$url->setParam('page', $page + 1)
->setAnchor('page-' . ($page + 1))
))
->setLabel(t('Load More'))
->setAttribute('data-no-icinga-ajax', true);
$this->addControl((new ServiceList([$this->service]))->setViewMode('minimal'));
$this->addControl($limitControl);
$historyList = (new HistoryList($results))
->setPageSize($limitControl->getLimit());
$historyList = (new HistoryList($history->execute()))
->setPageSize($limitControl->getLimit())
->setLoadMoreUrl($url);
if ($compact) {
$historyList->setPageNumber($page);
}
// TODO: Dirty, really dirty, find a better solution (And I don't just mean `getContent()` !)
$historyList->add($showMore->setTag('li')->addAttributes(['class' => 'list-item']));
if ($compact && $page > 1) {
$this->document->add($historyList->getContent());
$this->document->addFrom($historyList);
} else {
$this->addContent($historyList);
}