tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-04-08 17:15:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Widget\FilterEditor: handle custom vars

Browse Source 
There was an issue with custom vars as they made only partially part
of the column dropdown. Sorted columns and tried to beautify column
names.

fixes
This commit is contained in:
Thomas Gelf 2014-06-24 20:57:41 +02:00
parent 3f9f4bb9e1
commit 47b893e1ea
1 changed files with 5 additions and 4 deletions

9
library/Icinga/Web/Widget/FilterEditor.php

@ -50,12 +50,14 @@ class FilterEditor extends AbstractWidget
}
$html = '<select name="' . $view->escape($name) . '"' . $attributes . '>';
$beenActive = false;
sort($list);
foreach ($list as $k => $v) {
$active = '';
if ($k === $selected) {
$active = ' selected="selected"';
$beenActive = true;
}
$v = str_replace('_', ' ', ucfirst($v));
$html .= sprintf(
'<option value="%s"%s>%s</option>',
$view->escape($k),
@ -65,10 +67,9 @@ class FilterEditor extends AbstractWidget
}
if (! $beenActive && $selected) {
$html .= sprintf(
'<option value="%s"%s>%s</option>',
$view->escape($k),
$active,
$view->escape($selected) . ' (unknown)'
'<option value="%s" selected="selected">%s</option>',
$view->escape($selected),
$view->escape(str_replace('_', ' ', ucfirst(ltrim($selected, '_'))))
);
}
$html .= '</select>';