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

Controller::createColumnControl(): Add phpdoc and remove $resolver param

Browse source
This commit is contained in:
Bastian Lederer 2026-03-25 09:16:55 +01:00
parent afbe91e14a
commit 2bbabe0059
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,9 @@ class Controller extends CompatController
*
* @param Query $query
* @param ViewModeSwitcher $viewModeSwitcher
* @param Url $suggestionUrl
* @param array $defaultColumns
* @param Url $redirectUrl
*
* @return ColumnChooser provided columns
*/
@ -92,18 +94,16 @@ class Controller extends CompatController
Query $query,
ViewModeSwitcher $viewModeSwitcher,
Url $suggestionUrl,
Resolver $resolver,
array $defaultColumns,
Url $redirectUrl
): ColumnChooser {
// All of that is essentially what `ColumnControl::apply()` should do
$viewMode = $viewModeSwitcher->getViewMode();
$columnsDef = $this->params->shift('columns');
if (! $columnsDef) {
if ($viewMode === 'tabular') {
$columns = $defaultColumns;
} else {
return new ColumnChooser($suggestionUrl, $resolver);
return new ColumnChooser($suggestionUrl, $query->getResolver());
}
} else {
$columns = [];
@ -125,7 +125,7 @@ class Controller extends CompatController
$viewModeSwitcher->setViewMode('tabular');
}
return (new ColumnChooser($suggestionUrl, $resolver, $columns))
return (new ColumnChooser($suggestionUrl, $query->getResolver(), $columns))
->setAction((string) Url::fromRequest())
->on(ColumnChooser::ON_SENT, function (ColumnChooser $form) use ($redirectUrl) {
if ($form->hasBeenSubmitted()) {