Only qualify base columns during quick searches

All other columns are already qualified relative to the base model. This is usually sufficient because qualification is only required if applied to a query, which isn't happening at this stage. fixes #979
Icinga · Mar 14, 2024 · ecb5126 · ecb5126
1 parent b18db1c
commit ecb5126
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/library/Icingadb/Web/Control/SearchBar/ObjectSuggestions.php b/library/Icingadb/Web/Control/SearchBar/ObjectSuggestions.php
@@ -121,8 +121,12 @@ protected function createQuickSearchFilter($searchTerm)
 
         $quickFilter = Filter::any();
         foreach ($model->getSearchColumns() as $column) {
-            $where = Filter::like($resolver->qualifyColumn($column, $model->getTableName()), $searchTerm);
-            $where->metaData()->set('columnLabel', $resolver->getColumnDefinition($where->getColumn())->getLabel());
+            if (strpos($column, '.') === false) {
+                $column = $resolver->qualifyColumn($column, $model->getTableName());
+            }
+
+            $where = Filter::like($column, $searchTerm);
+            $where->metaData()->set('columnLabel', $resolver->getColumnDefinition($column)->getLabel());
             $quickFilter->add($where);
         }
 

diff --git a/library/Icingadb/Web/Controller.php b/library/Icingadb/Web/Controller.php
@@ -307,10 +307,11 @@ protected function prepareSearchFilter(Query $query, string $search, Filter\Any
     {
         $columns = array_merge($query->getModel()->getSearchColumns(), $additionalColumns);
         foreach ($columns as $column) {
-            $filter->add(Filter::like(
-                $query->getResolver()->qualifyColumn($column, $query->getModel()->getTableName()),
-                "*$search*"
-            ));
+            if (strpos($column, '.') === false) {
+                $column = $query->getResolver()->qualifyColumn($column, $query->getModel()->getTableName());
+            }
+
+            $filter->add(Filter::like($column, "*$search*"));
         }
     }