From 046696bd611faa42079f15319fe0f2ae68304dab Mon Sep 17 00:00:00 2001 From: MyuTsu Date: Tue, 20 May 2025 17:04:37 +0200 Subject: [PATCH 1/2] fix(issue): waiting status is not being computed correctly --- inc/formanswer.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php index cdc67cf82..cf9f55bcd 100644 --- a/inc/formanswer.class.php +++ b/inc/formanswer.class.php @@ -2006,9 +2006,12 @@ public function getAggregatedStatus(): ?int { } $ticketStatus = PluginFormcreatorCommon::getTicketStatusForIssue($generatedTarget); if ($ticketStatus >= PluginFormcreatorFormAnswer::STATUS_WAITING) { - // Ignore tickets refused or pending for validation - // getTicketStatusForIssue() does not returns STATUS_ACCEPTED - continue; + // force pending approval status to be seen from to_validate dashboard + if ($ticketStatus == PluginFormcreatorFormAnswer::STATUS_WAITING) { + return PluginFormcreatorFormAnswer::STATUS_WAITING; + } else { + continue; + } } if ($ticketStatus == CommonITILObject::WAITING) { From 6ee025097446a40ad48ed9bca6dc96ea8d3f7bc7 Mon Sep 17 00:00:00 2001 From: MyuTsu Date: Wed, 21 May 2025 16:03:18 +0200 Subject: [PATCH 2/2] review --- inc/formanswer.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php index cf9f55bcd..1dd059c3f 100644 --- a/inc/formanswer.class.php +++ b/inc/formanswer.class.php @@ -2005,13 +2005,13 @@ public function getAggregatedStatus(): ?int { continue; } $ticketStatus = PluginFormcreatorCommon::getTicketStatusForIssue($generatedTarget); - if ($ticketStatus >= PluginFormcreatorFormAnswer::STATUS_WAITING) { - // force pending approval status to be seen from to_validate dashboard - if ($ticketStatus == PluginFormcreatorFormAnswer::STATUS_WAITING) { - return PluginFormcreatorFormAnswer::STATUS_WAITING; - } else { - continue; - } + if ($ticketStatus > PluginFormcreatorFormAnswer::STATUS_WAITING) { + continue; + } + + // force pending approval status to be seen from to_validate dashboard + if ($ticketStatus == PluginFormcreatorFormAnswer::STATUS_WAITING) { + return PluginFormcreatorFormAnswer::STATUS_WAITING; } if ($ticketStatus == CommonITILObject::WAITING) {