upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-06-09 08:42:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust usages of filter property columnLabel

Browse source
This commit is contained in:
Johannes Meyer 2021-03-19 14:04:46 +01:00
parent e09bcc1379
commit f0368b404d
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/Icingadb/Web/Control/SearchBar/ObjectSuggestions.php
View file

@ -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);
}

7
library/Icingadb/Web/Controller.php
View file

@ -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', '..<customvar-name>'), $varName);
$condition->metaData()->set(
'columnLabel',
sprintf(t(ucfirst($target) . ' %s', '..<customvar-name>'), $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]);
}
}
})