fix(wizard): fix KB only browsing

pluginsGLPI · Apr 29, 2022 · de78b9e · de78b9e
1 parent bdae85a
commit de78b9e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/inc/knowbase.class.php b/inc/knowbase.class.php
@@ -58,7 +58,8 @@ public function showServiceCatalog() {
    public function showWizard() {
       echo '<div id="plugin_formcreator_kb_categories" class="card">';
       echo '<div><h2 class="card-title">'._n("Category", "Categories", 2, 'formcreator').'</h2></div>';
-      echo '<div><a href="#" id="kb_seeall"><i class="fas fa-home"></i></a></div>';
+      echo '<div class="slinky-menu"></div>';
+      echo '<div><a href="#" id="wizard_seeall">' . __('See all', 'formcreator') . '</a></div>';
       echo '</div>';
 
       echo '<div id="plugin_formcreator_wizard_right" class="card">';
@@ -100,11 +101,20 @@ public static function getCategoryTree() {
             [
                'SELECT' => ['COUNT DISTINCT' => KnowbaseItem::getTableField('id') . ' as cpt'],
                'FROM'   => KnowbaseItem::getTable(),
-               'WHERE'  => [
-                  KnowbaseItem::getTableField($cat_fk) => new QueryExpression(
-                     DB::quoteName(KnowbaseItemCategory::getTableField('id'))
-                  ),
-               ]
+               'LEFT JOIN' => [
+                  KnowbaseItem_KnowbaseItemCategory::getTable() => [
+                     'FKEY' => [
+                           KnowbaseItem::getTable() => 'id',
+                           KnowbaseItem_KnowbaseItemCategory::getTable() => KnowbaseItem::getForeignKeyField(),
+                     ],
+                  ],
+                  KnowbaseItemCategory::getTable() => [
+                     'FKEY' => [
+                        KnowbaseItem_KnowbaseItemCategory::getTable() => KnowbaseItemCategory::getForeignKeyField(),
+                        KnowbaseItemCategory::getTable() => 'id',
+                     ],
+                  ],
+               ],
             ],
             $kbitem_visibility_crit
          ),

diff --git a/js/scripts.js b/js/scripts.js
@@ -99,7 +99,7 @@ $(function() {
    } else if ($('#plugin_formcreator_kb_categories').length > 0) {
       updateKbCategoriesView();
 
-      $('#plugin_formcreator_kb_categories #kb_seeall').on('click', function (event) {
+      $('#plugin_formcreator_kb_categories #wizard_seeall').on('click', function (event) {
          slinkyCategories.home();
          plugin_formcreator.updateKbitemsView(event.target);
          $('#plugin_formcreator_kb_categories .category_active').removeClass('category_active');
@@ -210,9 +210,9 @@ function updateKbCategoriesView() {
       });
       $('#plugin_formcreator_kb_categories a.back').on('click',
          function(event) {
-            parentItem = $(event.target).parentsUntil('#plugin_formcreator_kb_categories > div', 'li')[1];
-            parentAnchor = $(parentItem).children('a')[0];
-            updateKbitemsView(parentAnchor.getAttribute('data-parent-category-id'));
+            var parentItem = $(event.target).parentsUntil('#plugin_formcreator_kb_categories .slinky-menu > ul', 'li')[1];
+            var parentAnchor = $(parentItem).children('a')[0];
+            plugin_formcreator.updateKbitemsView(parentAnchor);
          }
       );
 
@@ -314,7 +314,7 @@ function buildKbCategoryList(tree) {
    if (tree.id != 0) {
       html += '<a href="#" data-parent-category-id="' + tree.parent +'"'
          + ' data-category-id="' + tree.id + '"'
-         + ' onclick="plugin_formcreator.updateWizardFormsView(this)">'
+         + ' onclick="plugin_formcreator.updateKbitemsView(this)">'
          + tree.name
          + '</a>';
    }