Reset Limit count and offset for $table in HostController::services…

…Action The limit in ObjectsTable::prepareQuery() limits the number of services shown in HostController::servicesAction. But this limit is required for pagination in ServicesController. Hence, reset the limit when this query is used in HostController::servicesAction().
Icinga · Oct 6, 2022 · 638a359 · 638a359
1 parent d1ff0d9
commit 638a359
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php
@@ -210,7 +210,8 @@ public function servicesAction()
         $hostHasBeenCreatedInBranch = $branch->isBranch() && $host->get('id');
         $content = $this->content();
         $table = (new ObjectsTableService($this->db()))->setAuth($this->Auth())->setHost($host)
-            ->setTitle($this->translate('Individual Service objects'));
+            ->setTitle($this->translate('Individual Service objects'))
+            ->removeQueryLimit();
         if ($branch->isBranch()) {
             $table->setBranchUuid($branch->getUuid());
         }
@@ -226,7 +227,9 @@ public function servicesAction()
             $table = (new ObjectsTableService($this->db()))
                 ->setAuth($this->Auth())
                 ->setHost($parent)
-                ->setInheritedBy($host);
+                ->setInheritedBy($host)
+                ->removeQueryLimit();
+
             if (count($table)) {
                 $content->add(
                     $table->setTitle(sprintf(
@@ -253,6 +256,7 @@ public function servicesAction()
                     // ->setHost($host)
                     ->setAffectedHost($host)
                     ->setTitle($title)
+                    ->removeQueryLimit()
             );
         }
 

diff --git a/library/Director/Web/Table/IcingaServiceSetServiceTable.php b/library/Director/Web/Table/IcingaServiceSetServiceTable.php
@@ -267,4 +267,13 @@ public function prepareQuery()
 
         return $query;
     }
+
+    public function removeQueryLimit()
+    {
+        $query = $this->getQuery();
+        $query->reset($query::LIMIT_OFFSET);
+        $query->reset($query::LIMIT_COUNT);
+
+        return $this;
+    }
 }
diff --git a/library/Director/Web/Table/ObjectsTable.php b/library/Director/Web/Table/ObjectsTable.php
@@ -342,4 +342,13 @@ protected function prepareQuery()
 
         return $query;
     }
+
+    public function removeQueryLimit()
+    {
+        $query = $this->getQuery();
+        $query->reset($query::LIMIT_OFFSET);
+        $query->reset($query::LIMIT_COUNT);
+
+        return $this;
+    }
 }