From 5419d4428c86c488a43124f85e5407d7cbae6541 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 14 Apr 2024 15:17:47 +0200
Subject: Adding upstream version 1.11.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 library/Director/Web/Table/DatafieldTable.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'library/Director/Web/Table/DatafieldTable.php')

diff --git a/library/Director/Web/Table/DatafieldTable.php b/library/Director/Web/Table/DatafieldTable.php
index 4b321d7..0062626 100644
--- a/library/Director/Web/Table/DatafieldTable.php
+++ b/library/Director/Web/Table/DatafieldTable.php
@@ -5,12 +5,13 @@ namespace Icinga\Module\Director\Web\Table;
 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 @@ class DatafieldTable extends ZfQueryBasedTable
         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 @@ class DatafieldTable extends ZfQueryBasedTable
         )->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
@@ -96,7 +107,7 @@ class DatafieldTable extends ZfQueryBasedTable
      */
     protected function makeDatafieldSub($type, ZfDbAdapter $db)
     {
-        return $db->select()->from("icinga_${type}_field", [
+        return $db->select()->from("icinga_{$type}_field", [
             'cnt' => 'COUNT(*)',
             'datafield_id'
         ])->group('datafield_id');
@@ -110,7 +121,7 @@ class DatafieldTable extends ZfQueryBasedTable
      */
     protected function makeVarSub($type, ZfDbAdapter $db)
     {
-        return $db->select()->from("icinga_${type}_var", [
+        return $db->select()->from("icinga_{$type}_var", [
             'cnt' => 'COUNT(*)',
             'varname'
         ])->group('varname');
-- 
cgit v1.2.3