AssignRenderer and Form: "is true/set" operator

refs #339 fixes #729 fixes #739
Icinga · Aug 25, 2017 · 99eb6ac · 99eb6ac
1 parent ee21c63
commit 99eb6ac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/application/views/helpers/FormDataFilter.php b/application/views/helpers/FormDataFilter.php
@@ -167,6 +167,9 @@ protected function element(FilterExpression $filter = null)
                 $filter->setExpression(json_decode($filter->getExpression()));
             }
 
+            if ($filter->getExpression() === true) {
+                return '';
+            }
             $dummy = IcingaObject::createByType($type);
             $col = $filter->getColumn();
             if ($dummy->hasProperty($col)) {
@@ -224,8 +227,6 @@ protected function text(Filter $filter = null)
                 $this->elementId('value', $filter),
                 $value
             );
-
-            $value = '(' . implode('|', $value) . ')';
         }
 
         return $this->view->formText(
@@ -298,7 +299,7 @@ protected function selectSign(FilterExpression $filter = null)
             '<=' => '<=',
             'in' => 'in',
             'contains' => 'contains',
-            // 'true' => 'is true (or set)',
+            'true' => 'is true (or set)',
         );
 
         if ($filter === null) {

diff --git a/library/Director/IcingaConfig/AssignRenderer.php b/library/Director/IcingaConfig/AssignRenderer.php
@@ -133,6 +133,9 @@ protected function renderFilterExpression(FilterExpression $filter)
                 );
             }
         } elseif ($filter instanceof FilterMatch) {
+            if ($rawExpression === true) {
+                return $column;
+            }
             if (strpos($expression, '*') === false) {
                 return $this->renderEquals($column, $expression);
             } else {

diff --git a/public/css/module.less b/public/css/module.less
@@ -1386,8 +1386,8 @@ div.filter-expression {
         margin: 0 0.3em;
         &.wide {
             min-width: 6em;
-            max-width: 6em;
-            width: 6em;
+            max-width: 8em;
+            width: 8em;
         }
     }