fix(category): translation feature of dropdowns not handled

btry · btry · commit 6287f1b349b8 · 2023-09-25T09:55:35.000+02:00
diff --git a/inc/category.class.php b/inc/category.class.php
@@ -130,18 +130,51 @@ public static function getCategoryTree(): array {
       ]);
       $request = [
          'SELECT' => [
-            'id',
-            'name',
-            'comment',
+            self::getTableField('id'),
             "$categoryFk as parent",
             'level',
             new QueryExpression(
                $count1->getQuery() . " + " . $count2->getQuery() . " as items_count"
             ),
          ],
          'FROM' => $cat_table,
+         'LEFT JOIN' => [],
          'ORDER' => ["level DESC", "name DESC"],
       ];
+      $translation_table = DropdownTranslation::getTable();
+      if (Session::haveTranslations(self::getType(), 'name')) {
+         $request['LEFT JOIN']["$translation_table as namet"] = [
+            'FKEY' => [
+               $cat_table => 'id',
+               'namet' => 'items_id',
+               ['AND' => [
+                  'namet.language' => $_SESSION['glpilanguage'],
+                  'namet.itemtype' => self::getType(),
+                  'namet.field' => 'name',
+               ]],
+            ],
+         ];
+         $request['SELECT'][] = 'namet.value as name';
+      } else {
+         $request['SELECT'][] = 'name';
+         $request['SELECT'][] = 'comment';
+      }
+      if (Session::haveTranslations(self::getType(), 'comment')) {
+         $request['LEFT JOIN']["$translation_table as commentt"] = [
+            'FKEY' => [
+               $cat_table => 'id',
+               'commentt' => 'items_id',
+               ['AND' => [
+                  'namet.language' => $_SESSION['glpilanguage'],
+                  'namet.itemtype' => self::getType(),
+                  'namet.field' => 'comment',
+               ]],
+            ],
+         ];
+         $request['SELECT'][] = 'commentt.value as comment';
+      } else {
+         $request['SELECT'][] = 'comment';
+      }
       $result = $DB->request($request);
 
       $categories = [];
