fix(category): bad conversion from raw SQL to quiery builder

pluginsGLPI · Aug 22, 2019 · 9cbbfe7 · 9cbbfe7
1 parent 073c76e
commit 9cbbfe7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/inc/category.class.php b/inc/category.class.php
@@ -101,7 +101,7 @@ public static function getCategoryTree($rootId = 0, $helpdeskHome = false) {
             "$form_table.plugin_formcreator_categories_id" => new QueryExpression("$cat_table.id"),
             'language' => [$_SESSION['glpilanguage'], '', '0', null],
             'OR' => [
-               'access_rights' => ['!=' => PluginFormcreatorForm::ACCESS_RESTRICTED],
+               'access_rights' => ['!=', PluginFormcreatorForm::ACCESS_RESTRICTED],
                'id' => new QuerySubQuery([
                   'SELECT' => 'plugin_formcreator_forms_id',
                   'FROM' => $table_fp,
@@ -116,8 +116,8 @@ public static function getCategoryTree($rootId = 0, $helpdeskHome = false) {
          'COUNT' => 'count',
          'FROM' => (new QueryExpression("($query_faqs) as faqs")),
          'WHERE' => [
-            "faqs.knowbaseitemcategories_id" => "$cat_table.knowbaseitemcategories_id",
-            "faqs.knowbaseitemcategories_id" => ['!=' => '0'],
+            [(new QueryExpression("faqs.knowbaseitemcategories_id = $cat_table.knowbaseitemcategories_id"))],
+            ["faqs.knowbaseitemcategories_id" => ['!=', '0'],],
          ]
       ]);
       $request = [

diff --git a/tests/suite-unit/PluginFormcreatorCategory.php b/tests/suite-unit/PluginFormcreatorCategory.php
@@ -64,7 +64,6 @@ public function testGetTypeName($nb, $expected) {
 
    public function testGetCategoryTree() {
       $this->login('glpi', 'glpi');
-      $_SESSION["glpicronuserrunning"] = true;
 
       // create a sub entity which will take in the forms and cateory for this test
       // and not conflict with previous data
@@ -98,7 +97,7 @@ public function testGetCategoryTree() {
             'name'                             => "testgetCategoryTree form $i",
             'entities_id'                      => $entities_id,
             'is_active'                        => 1,
-            'is_helpdesk_home'                 => 1,
+            'helpdesk_home'                    => 1,
             'plugin_formcreator_categories_id' => $categories[$i]
          ]);
       }