action-list.js: Don't add footer for list in .controls (#867)

fixes #866
Icinga · Sep 12, 2023 · 84eeeaa · 84eeeaa
2 parents 959f06c + 5c30e53
commit 84eeeaa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/application/controllers/HostsController.php b/application/controllers/HostsController.php
@@ -168,6 +168,7 @@ public function detailsAction()
         $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
@@ -184,6 +184,7 @@ public function detailsAction()
         $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
@@ -133,7 +133,9 @@ public function addMultiselectFilterAttribute(BaseHtmlElement $element, Filter\R
     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
@@ -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);
                 }