diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php index 36774b3c..fff7139a 100644 --- a/application/controllers/HostsController.php +++ b/application/controllers/HostsController.php @@ -168,6 +168,7 @@ class HostsController extends Controller $this->addControl( (new HostList($results)) ->setViewMode('minimal') + ->setDetailActionsDisabled() ); $this->addControl(new ShowMore( $results, diff --git a/application/controllers/ServicesController.php b/application/controllers/ServicesController.php index 69d02f39..c39f8b5d 100644 --- a/application/controllers/ServicesController.php +++ b/application/controllers/ServicesController.php @@ -184,6 +184,7 @@ class ServicesController extends Controller $this->addControl( (new ServiceList($results)) ->setViewMode('minimal') + ->setDetailActionsDisabled() ); $this->addControl(new ShowMore( $results, diff --git a/library/Icingadb/Common/DetailActions.php b/library/Icingadb/Common/DetailActions.php index bc62f48a..b182b1f2 100644 --- a/library/Icingadb/Common/DetailActions.php +++ b/library/Icingadb/Common/DetailActions.php @@ -133,7 +133,9 @@ trait DetailActions public function addDetailFilterAttribute(BaseHtmlElement $element, Filter\Rule $filter): self { $element->getAttributes() - ->set('data-action-item', true) + ->registerAttributeCallback('data-action-item', function () { + return ! $this->getDetailActionsDisabled(); + }) ->registerAttributeCallback('data-icinga-detail-filter', function () use ($filter) { return $this->getDetailActionsDisabled() ? null : QueryString::render($filter); }); diff --git a/public/js/action-list.js b/public/js/action-list.js index 5eaf0a4a..44738c25 100644 --- a/public/js/action-list.js +++ b/public/js/action-list.js @@ -719,7 +719,7 @@ } if (isTopLevelContainer) { - let footerList = list ?? container.querySelector('.action-list'); + let footerList = list ?? container.querySelector('.content > .action-list'); if (footerList) { _this.addSelectionCountToFooter(footerList); }