Merge branch '2024.11'

tine-groupware · Feb 17, 2025 · a548978 · a548978
2 parents a36c103 + 1053c1b
commit a548978
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 4 deletions.
diff --git a/tine20/EventManager/Setup/Update/17.php b/tine20/EventManager/Setup/Update/17.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Tine 2.0
+ *
+ * @package     EventManager
+ * @subpackage  Setup
+ * @license     http://www.gnu.org/licenses/agpl.html AGPL3
+ * @copyright   Copyright (c) 2025 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @author      Philipp Schüle <[email protected]>
+ *
+ * this is 2024.11 (ONLY!)
+ */
+class EventManager_Setup_Update_17 extends Setup_Update_Abstract
+{
+    const RELEASE017_UPDATE000 = __CLASS__ . '::update000';
+
+    static protected $_allUpdates = [
+        self::PRIO_NORMAL_APP_UPDATE        => [
+            self::RELEASE017_UPDATE000          => [
+                self::CLASS_CONST                   => self::class,
+                self::FUNCTION_CONST                => 'update000',
+            ],
+        ],
+    ];
+
+    public function update000()
+    {
+        $this->addApplicationUpdate(EventManager_Config::APP_NAME, '17.0', self::RELEASE017_UPDATE000);
+    }
+}
diff --git a/tine20/Inventory/Model/Type.php b/tine20/Inventory/Model/Type.php
@@ -6,7 +6,7 @@
  * @subpackage  Model
  * @license     http://www.gnu.org/licenses/agpl.html AGPL Version 3
  * @author      Ching-En, Cheng <[email protected]>
- * @copyright   Copyright (c) 2024 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @copyright   Copyright (c) 2024-2025 Metaways Infosystems GmbH (http://www.metaways.de)
  *
  */
 
@@ -69,9 +69,13 @@ class Inventory_Model_Type extends Tinebase_Record_NewAbstract
 
         self::TABLE => [
             self::NAME => self::TABLE_NAME,
-            self::INDEXES => [],
+            self::INDEXES => [
+                self::FLD_DESCRIPTION => [
+                    self::COLUMNS       => [self::FLD_DESCRIPTION],
+                    self::FLAGS         => [self::TYPE_FULLTEXT],
+                ],
+            ],
         ],
-
 
         self::FIELDS => [
             self::FLD_NAME => [

diff --git a/tine20/Inventory/Setup/Update/17.php b/tine20/Inventory/Setup/Update/17.php
@@ -6,7 +6,7 @@
  * @package     Inventory
  * @subpackage  Setup
  * @license     http://www.gnu.org/licenses/agpl.html AGPL3
- * @copyright   Copyright (c) 2023-2024 Metaways Infosystems GmbH (http://www.metaways.de)
+ * @copyright   Copyright (c) 2023-2025 Metaways Infosystems GmbH (http://www.metaways.de)
  * @author      Paul Mehrer <[email protected]>
  *
  * this is 2024.11 (ONLY!)
@@ -18,6 +18,7 @@ class Inventory_Setup_Update_17 extends Setup_Update_Abstract
     const RELEASE017_UPDATE002 = __CLASS__ . '::update002';
     const RELEASE017_UPDATE003 = __CLASS__ . '::update003';
     const RELEASE017_UPDATE004 = __CLASS__ . '::update004';
+    const RELEASE017_UPDATE005 = __CLASS__ . '::update005';
 
 
     static protected $_allUpdates = [
@@ -36,6 +37,10 @@ class Inventory_Setup_Update_17 extends Setup_Update_Abstract
                 self::CLASS_CONST                   => self::class,
                 self::FUNCTION_CONST                => 'update003',
             ],
+            self::RELEASE017_UPDATE005          => [
+                self::CLASS_CONST                   => self::class,
+                self::FUNCTION_CONST                => 'update005',
+            ],
         ],
         self::PRIO_NORMAL_APP_UPDATE        => [
             self::RELEASE017_UPDATE000          => [
@@ -110,4 +115,12 @@ public function update004()
         ]);
         $this->addApplicationUpdate(Inventory_Config::APP_NAME, '17.4', self::RELEASE017_UPDATE004);
     }
+
+    public function update005()
+    {
+        Setup_SchemaTool::updateSchema([
+            Inventory_Model_Type::class
+        ]);
+        $this->addApplicationUpdate(Inventory_Config::APP_NAME, '17.5', self::RELEASE017_UPDATE005);
+    }
 }