(Host/Service)groupController: Don't overwrite the (SearchBar/SearchE…

…ditor) suggestionUrl SuggestionUrl now uses the preserveParams as default params ref: Icinga/ipl-web#233
Icinga · Oct 21, 2024 · 0882dfe · 0882dfe
1 parent 4806939
commit 0882dfe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/application/controllers/HostgroupController.php b/application/controllers/HostgroupController.php
@@ -18,7 +18,6 @@
 use ipl\Stdlib\Filter;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
-use ipl\Web\Url;
 
 class HostgroupController extends Controller
 {
@@ -84,14 +83,7 @@ public function indexAction(): Generator
             $sortControl->getSortParam(),
             $viewModeSwitcher->getViewModeParam(),
             'name'
-        ])->setSuggestionUrl(Url::fromPath(
-            'icingadb/hostgroup/complete',
-            [
-                'name' => $this->hostgroupName,
-                '_disableLayout' => true,
-                'showCompact' => true
-            ]
-        ));
+        ]);
 
         if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
             if ($searchBar->hasBeenSubmitted()) {
@@ -156,6 +148,10 @@ public function searchEditorAction(): void
             'name'
         ]);
 
+        if ($editor->getSuggestionUrl()) {
+            $editor->getSuggestionUrl()->addParams(['name' => $this->hostgroupName]);
+        }
+
         $this->getDocument()->add($editor);
         $this->setTitle(t('Adjust Filter'));
     }

diff --git a/application/controllers/ServicegroupController.php b/application/controllers/ServicegroupController.php
@@ -18,7 +18,6 @@
 use ipl\Stdlib\Filter;
 use ipl\Web\Control\LimitControl;
 use ipl\Web\Control\SortControl;
-use ipl\Web\Url;
 
 class ServicegroupController extends Controller
 {
@@ -92,14 +91,7 @@ public function indexAction(): Generator
             $sortControl->getSortParam(),
             $viewModeSwitcher->getViewModeParam(),
             'name'
-        ])->setSuggestionUrl(Url::fromPath(
-            'icingadb/servicegroup/complete',
-            [
-                'name' => $this->servicegroupName,
-                '_disableLayout' => true,
-                'showCompact' => true
-            ]
-        ));
+        ]);
 
         if ($searchBar->hasBeenSent() && ! $searchBar->isValid()) {
             if ($searchBar->hasBeenSubmitted()) {