Fix(Container): deactivate domtab that no longer works and stop offer… (

#741) * Fix(Container): deactivate domtab that no longer works and handle ITILSolution * remove ITILSolution for type 'tab' * fix comment * Update inc/container.class.php --------- Co-authored-by: Romain B <[email protected]>
pluginsGLPI · Feb 21, 2024 · 5024bf1 · 5024bf1
1 parent 0540c7e
commit 5024bf1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/inc/container.class.php b/inc/container.class.php
@@ -323,6 +323,27 @@ public static function installUserData(Migration $migration, $version)
             }
         }
 
+
+        //Ticket Solution tab no longer exist disable it
+        //Problem Solution tab no longer exist disable it
+        //Change Analysis / Solution / Plans no longer exist disable it
+        $DB->update(
+            'glpi_plugin_fields_containers',
+            [
+                'is_active' => 0,
+            ],
+            [
+                'type' => 'domtab',
+                [
+                    'OR' => [
+                        ['subtype' => ['LIKE', 'Ticket$2']],
+                        ['subtype' => ['LIKE', 'Problem$2']],
+                        ['subtype' => ['LIKE', 'Change$%']],
+                    ],
+                ],
+            ]
+        );
+
         // Ensure data is update before regenerating files.
         $migration->executeMigration();
 
@@ -878,11 +899,17 @@ public function showForm($ID, $options = [])
     public static function showFormItemtype($params = [])
     {
         $is_domtab = isset($params['type']) && $params['type'] == 'domtab';
+        $values = self::getItemtypes($is_domtab);
+
+        //remove ITISolution from values if type is tab
+        if (!isset($params['type']) || (isset($params['type']) && $params['type'] == 'tab')) {
+            unset($values[__('Assistance')]['ITILSolution']);
+        }
 
         $rand = $params['rand'];
         Dropdown::showFromArray(
             "itemtypes",
-            self::getItemtypes($is_domtab),
+            $values,
             [
                 'rand'                => $rand,
                 'multiple'            => !$is_domtab,
@@ -1986,19 +2013,6 @@ private static function getSubtypes($item)
     {
         $tabs = [];
         switch ($item::getType()) {
-            case Ticket::getType():
-            case Problem::getType():
-                $tabs = [
-                    $item::getType() . '$2' => __('Solution')
-                ];
-                break;
-            case Change::getType():
-                $tabs = [
-                    'Change$1' => __('Analysis'),
-                    'Change$2' => __('Solution'),
-                    'Change$3' => __('Plans')
-                ];
-                break;
             case Entity::getType():
                 $tabs = [
                     'Entity$2' => __('Address'),

diff --git a/inc/field.class.php b/inc/field.class.php
@@ -864,12 +864,12 @@ public static function showForTab($params)
         $item = $params['item'];
 
         $functions = array_column(debug_backtrace(), 'function');
-
         $subtype = isset($_SESSION['glpi_tabs'][strtolower($item::getType())]) ? $_SESSION['glpi_tabs'][strtolower($item::getType())] : "";
         $type = substr($subtype, -strlen('$main')) === '$main'
             || in_array('showForm', $functions)
             || in_array('showPrimaryForm', $functions)
             || in_array('showFormHelpdesk', $functions)
+            || $item::getType() == ITILSolution::class
                 ? 'dom'
                 : 'domtab';
         if ($subtype == -1) {
@@ -918,6 +918,7 @@ public static function showForTab($params)
             strpos($current_url, ".form.php") === false
             && strpos($current_url, ".injector.php") === false
             && strpos($current_url, ".public.php") === false
+            && strpos($current_url, "ajax/timeline.php") === false // ITILSolution load from timeline
         ) {
             return false;
         }
@@ -1046,6 +1047,7 @@ function(evt) {
         );
     }
 
+
     public static function prepareHtmlFields(
         $fields,
         $item,

diff --git a/inc/toolbox.class.php b/inc/toolbox.class.php
@@ -236,6 +236,7 @@ public static function getGlpiItemtypes(): array
             Ticket::class,
             Problem::class,
             Change::class,
+            ITILSolution::class,
             TicketRecurrent::class,
             RecurrentChange::class,
             PlanningExternalEvent::class,