refactor: Allow _perc and _current columns to be string for alert rul…

…es (librenms#8532) * refactor: Allow _perc and _current columns to be string for alert rules * Moved the check for column type
otkd · Apr 14, 2018 · 3db26c1 · 3db26c1
1 parent d08e1e6
commit 3db26c1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/LibreNMS/Alerting/QueryBuilderFilter.php b/LibreNMS/Alerting/QueryBuilderFilter.php
@@ -110,8 +110,12 @@ private function generateTableFilter()
 
                 $field = "$table.$column";
 
-                // format enums as radios
-                if ($type == 'enum') {
+                if (ends_with($column, ['_perc', '_current'])) {
+                    $this->filter[$field] = [
+                        'id' => $field,
+                        'type' => 'string',
+                    ];
+                } elseif ($type == 'enum') {// format enums as radios
                     $values = explode(',', substr($column_type, 4));
                     $values = array_map(function ($val) {
                         return trim($val, "()' ");