Skip to content

Commit 605dd98

Browse files
wip
1 parent f88b644 commit 605dd98

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

application/controllers/HostsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ public function indexAction()
9797
$this->addControl($limitControl);
9898
$this->addControl($viewModeSwitcher);
9999
$this->addControl($searchBar);
100-
$continueWith = $this->createContinueWith(Links::hostsDetails(), $searchBar);
101100

102101
$results = $hosts->execute();
103102

103+
$continueWith = $this->createContinueWith(Links::hostsDetails(), $searchBar, $results->hasResult());
104104
if ($viewModeSwitcher->getViewMode() === 'tabular') {
105105
$hostList = (new HostItemTable($results, HostItemTable::applyColumnMetaData($hosts, $columns)))
106106
->setSort($sortControl->getSort());

application/controllers/ServicesController.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,11 @@ public function indexAction()
108108
$this->addControl($limitControl);
109109
$this->addControl($viewModeSwitcher);
110110
$this->addControl($searchBar);
111-
$continueWith = $this->createContinueWith(Links::servicesDetails(), $searchBar);
112111

113112
$results = $services->execute();
114113

114+
$continueWith = $this->createContinueWith(Links::servicesDetails(), $searchBar, $results->hasResult());
115+
115116
if ($viewModeSwitcher->getViewMode() === 'tabular') {
116117
$serviceList = (new ServiceItemTable($results, ServiceItemTable::applyColumnMetaData($services, $columns)))
117118
->setSort($sortControl->getSort());
@@ -316,6 +317,7 @@ public function gridAction()
316317
$this->view->pivotData = $pivotData;
317318
$this->view->pivotHeader = $pivotHeader;
318319

320+
$continueWith->setHasResults(! empty($pivotData));
319321
/** Preserve filter and params in view links (the `BaseFilter` implementation for view scripts -.-) */
320322
$this->view->baseUrl = Url::fromRequest()
321323
->onlyWith([

library/Icingadb/Common/SearchControls.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@ public function createSearchBar(Query $query, ...$params): SearchBar
5151
*
5252
* @param Url $detailsUrl
5353
* @param SearchBar $searchBar
54+
* @param bool $hasResults Whether the current query has results
5455
*
5556
* @return ContinueWith
5657
*/
57-
public function createContinueWith(Url $detailsUrl, SearchBar $searchBar): ContinueWith
58+
public function createContinueWith(Url $detailsUrl, SearchBar $searchBar, bool $hasResults = true): ContinueWith
5859
{
59-
$continueWith = new ContinueWith($detailsUrl, [$searchBar, 'getFilter']);
60+
$continueWith = new ContinueWith($detailsUrl, [$searchBar, 'getFilter'], $hasResults);
6061
$continueWith->setTitle(t('Show bulk processing actions for all filtered results'));
6162
$continueWith->setBaseTarget('_next');
6263
$continueWith->getAttributes()

0 commit comments

Comments
 (0)