From 47b893e1ea061a126e032409e1cd33b06bcb4e17 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 24 Jun 2014 20:57:41 +0200
Subject: [PATCH] Widget\FilterEditor: handle custom vars

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 #6569
---
 library/Icinga/Web/Widget/FilterEditor.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/Icinga/Web/Widget/FilterEditor.php b/library/Icinga/Web/Widget/FilterEditor.php
index 3c508fb92..21f121bd2 100644
--- a/library/Icinga/Web/Widget/FilterEditor.php
+++ b/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>';