Merge branch 'feature/datafields-search-case-insensitive-2359'

Icinga · Jul 20, 2023 · f7a295c · f7a295c
2 parents 7ed87f0 + 7a29d7d
commit f7a295c
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/library/Director/Web/Table/DatafieldTable.php b/library/Director/Web/Table/DatafieldTable.php
@@ -5,12 +5,13 @@
 use gipfl\IcingaWeb2\Link;
 use gipfl\IcingaWeb2\Table\ZfQueryBasedTable;
 use Zend_Db_Adapter_Abstract as ZfDbAdapter;
+use Zend_Db_Expr as DbExpr;
 use Zend_Db_Select as ZfDbSelect;
 
 class DatafieldTable extends ZfQueryBasedTable
 {
     protected $searchColumns = [
-        'df.varname',
+        'lc_varname',
         'df.caption',
     ];
 
@@ -19,6 +20,7 @@ public function getColumns()
         return [
             'id'              => 'df.id',
             'varname'         => 'df.varname',
+            'lc_varname'      => new DbExpr('LOWER(df.varname)'),
             'caption'         => 'df.caption',
             'description'     => 'df.description',
             'datatype'        => 'df.datatype',
@@ -88,6 +90,15 @@ public function prepareQuery()
         )->group('df.id')->group('df.varname')->group('dfc.category_name')->order('caption ASC');
     }
 
+    public function search($search)
+    {
+        if ($search !== null) {
+            $search = strtolower($search);
+        }
+
+        return parent::search($search);
+    }
+
     /**
      * @param $type
      * @param ZfDbAdapter $db