From a7c230afafa733d04eb97fe2a4ac107e114552c3 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 6 Nov 2020 14:13:38 +0100 Subject: [PATCH] Controller: Normalize filter columns in the search bar --- library/Icingadb/Web/Controller.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/library/Icingadb/Web/Controller.php b/library/Icingadb/Web/Controller.php index 9fe94f36..3c0dc16c 100644 --- a/library/Icingadb/Web/Controller.php +++ b/library/Icingadb/Web/Controller.php @@ -141,6 +141,11 @@ class Controller extends CompatController $filter = QueryString::fromString($this->getFilter()->toQueryString()) ->on(QueryString::ON_CONDITION, function (Condition $condition) use ($query) { $path = $condition->getColumn(); + if (strpos($path, '.') === false) { + $path = $query->getResolver()->qualifyPath($path, $query->getModel()->getTableName()); + $condition->setColumn($path); + } + if (strpos($path, '.vars.') !== false) { list($target, $varName) = explode('.vars.', $path); if (strpos($target, '.') === false) {