fix(issue): Show pending / accepted forms search results

pluginsGLPI · Jun 30, 2022 · 58ea066 · 58ea066
1 parent 6487611
commit 58ea066
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/hook.php b/hook.php
@@ -243,6 +243,14 @@ function plugin_formcreator_addWhere($link, $nott, $itemtype, $ID, $val, $search
                   $tocheck = $item->getNewStatusArray();
                   break;
 
+               case Ticket::WAITING:
+                  $tocheck = $item->getPendingStatusArray();
+                  break;
+
+               case Ticket::CLOSED:
+                  $tocheck = $item->getClosedStatusArray();
+                  break;
+
                case 'process' :
                   // getProcessStatusArray should be an abstract method of CommonITILObject
                   $tocheck = $item->getProcessStatusArray();

diff --git a/inc/issue.class.php b/inc/issue.class.php
@@ -864,15 +864,19 @@ public static function giveItem($itemtype, $option_id, $data, $num) {
    }
 
    static function getClosedStatusArray() {
-      return Ticket::getClosedStatusArray();
+      return [...Ticket::getClosedStatusArray(), PluginFormcreatorFormAnswer::STATUS_ACCEPTED];
    }
 
    static function getSolvedStatusArray() {
       return [...Ticket::getSolvedStatusArray(), PluginFormcreatorFormAnswer::STATUS_REFUSED];
    }
 
    static function getNewStatusArray() {
-      return [Ticket::INCOMING, PluginFormcreatorFormAnswer::STATUS_WAITING, PluginFormcreatorFormAnswer::STATUS_ACCEPTED];
+      return [Ticket::INCOMING];
+   }
+
+   static function getPendingStatusArray() {
+      return [Ticket::WAITING, PluginFormcreatorFormAnswer::STATUS_WAITING];
    }
 
    static function getProcessStatusArray() {