From f0368b404d926ef22d25a686d629017c533d69cc Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 19 Mar 2021 14:04:46 +0100 Subject: [PATCH] Adjust usages of filter property `columnLabel` --- .../Icingadb/Web/Control/SearchBar/ObjectSuggestions.php | 2 +- library/Icingadb/Web/Controller.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/library/Icingadb/Web/Control/SearchBar/ObjectSuggestions.php b/library/Icingadb/Web/Control/SearchBar/ObjectSuggestions.php index b48679ea..f271d3b4 100644 --- a/library/Icingadb/Web/Control/SearchBar/ObjectSuggestions.php +++ b/library/Icingadb/Web/Control/SearchBar/ObjectSuggestions.php @@ -86,7 +86,7 @@ class ObjectSuggestions extends Suggestions $quickFilter = Filter::any(); foreach ($model->getSearchColumns() as $column) { $where = Filter::equal($model->getTableName() . '.' . $column, $searchTerm); - $where->columnLabel = $model->getMetaData()[$column]; + $where->metaData()->set('columnLabel', $model->getMetaData()[$column]); $quickFilter->add($where); } diff --git a/library/Icingadb/Web/Controller.php b/library/Icingadb/Web/Controller.php index 65189ed1..9c775104 100644 --- a/library/Icingadb/Web/Controller.php +++ b/library/Icingadb/Web/Controller.php @@ -146,14 +146,17 @@ class Controller extends CompatController list($target, $varName) = explode('.vars.', $path); if (strpos($target, '.') === false) { // Programmatically translated since the full definition is available in class ObjectSuggestions - $condition->columnLabel = sprintf(t(ucfirst($target) . ' %s', '..'), $varName); + $condition->metaData()->set( + 'columnLabel', + sprintf(t(ucfirst($target) . ' %s', '..'), $varName) + ); } } else { $metaData = iterator_to_array( ObjectSuggestions::collectFilterColumns($query->getModel(), $query->getResolver()) ); if (isset($metaData[$path])) { - $condition->columnLabel = $metaData[$path]; + $condition->metaData()->set('columnLabel', $metaData[$path]); } } })