fix(issue): recreate when restore ticket

pluginsGLPI · Sep 2, 2022 · 2656e28 · 2656e28
1 parent 247a574
commit 2656e28
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/hook.php b/hook.php
@@ -344,11 +344,6 @@ function plugin_formcreator_hook_add_ticket(CommonDBTM $item) {
       return;
    }
 
-   if (isset($item->input['items_id'][PluginFormcreatorFormAnswer::getType()])) {
-      // the ticket is associated to a form answer
-      return;
-   }
-
    $requester = $DB->request([
       'SELECT' => 'users_id',
       'FROM' => Ticket_User::getTable(),
@@ -482,15 +477,16 @@ function plugin_formcreator_hook_delete_ticket(CommonDBTM $item) {
 
 function plugin_formcreator_hook_restore_ticket(CommonDBTM $item) {
    $formAnswer = new PluginFormcreatorFormAnswer();
-   if (! $formAnswer->getFromDbByTicket($item)) {
-      plugin_formcreator_hook_add_ticket($item);
+   if ($formAnswer->getFromDbByTicket($item)) {
+      $formAnswer->createIssue();
+      $minimalStatus = $formAnswer->getAggregatedStatus();
+      if ($minimalStatus !== null) {
+         $formAnswer->updateStatus($minimalStatus);
+      }
       return;
    }
 
-   $minimalStatus = $formAnswer->getAggregatedStatus();
-   if ($minimalStatus !== null) {
-      $formAnswer->updateStatus($minimalStatus);
-   }
+   plugin_formcreator_hook_add_ticket($item);
 }
 
 function plugin_formcreator_hook_purge_ticket(CommonDBTM $item) {

diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
@@ -1102,7 +1102,9 @@ public function post_addItem() {
             return;
          }
       }
-      $this->createIssue();
+      if ($this->input['status'] != self::STATUS_REFUSED) {
+         $this->createIssue();
+      }
       $minimalStatus = $formAnswer->getAggregatedStatus();
       if ($minimalStatus !== null) {
          $this->updateStatus($minimalStatus);
@@ -1346,14 +1348,9 @@ private function sendNotification() {
       }
    }
 
-   private function createIssue() {
+   public function createIssue() {
       global $DB;
 
-      $issue = new PluginFormcreatorIssue();
-      if ($this->input['status'] == self::STATUS_REFUSED) {
-         return;
-      }
-
       // If cannot get itemTicket from DB it happens either
       // when no item exist
       // or when several rows matches
@@ -1377,6 +1374,8 @@ private function createIssue() {
             'items_id' => $this->getID(),
          ]
       ]);
+
+      $issue = new PluginFormcreatorIssue();
       if ($rows->count() != 1) {
          // There is no or several tickets for this form answer
          // The issue must be created from this form answer