fix(issue): issue not updated to refused status

pluginsGLPI · Dec 5, 2017 · 8b1e3b8 · 8b1e3b8
1 parent f1ac36b
commit 8b1e3b8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/front/form_answer.form.php b/front/form_answer.form.php
@@ -32,7 +32,12 @@
    $_POST['plugin_formcreator_forms_id'] = intval($_POST['formcreator_form']);
    $_POST['status']                      = 'waiting';
    $formanswer->saveAnswers($_POST);
-   $formanswer->redirectToList();
+   if (plugin_formcreator_replaceHelpdesk()) {
+      $issue = new PluginFormcreatorIssue();
+      $issue->redirectToList();
+   } else {
+      $formanswer->redirectToList();
+   }
 
    // Show target ticket form
 } else {

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -571,7 +571,6 @@ public function showServiceCatalog() {
    }
 
    public function showWizard($service_catalog = false) {
-
       echo '<div id="plugin_formcreator_wizard_categories">';
       echo '<div><h2>'._n("Category", "Categories", 2, 'formcreator').'</h2></div>';
       echo '<div><a href="#" id="wizard_seeall">' . __('see all', 'formcreator') . '</a></div>';

diff --git a/inc/form_answer.class.php b/inc/form_answer.class.php
@@ -655,19 +655,19 @@ public function saveAnswers($data) {
          }
 
          // Update issues table
+         $issue = new PluginFormcreatorIssue();
+         $formAnswerId = $this->getID();
          if ($status != 'refused') {
 
             // If cannot get itemTicket from DB it happens either
             // when no item exist
             // when several rows matches
             // Both are processed the same way
-            $formAnswerId = $this->getID();
             $itemTicket = new Item_Ticket();
             $rows = $itemTicket->find("`itemtype` = 'PluginFormcreatorForm_Answer' AND `items_id` = '$formAnswerId'");
             if (count($rows) != 1) {
                if ($is_newFormAnswer) {
                   // This is a new answer for the form. Create an issue
-                  $issue = new PluginFormcreatorIssue();
                   $issue->add([
                      'original_id'     => $id,
                      'sub_itemtype'    => 'PluginFormcreatorForm_Answer',
@@ -682,7 +682,6 @@ public function saveAnswers($data) {
                      'comment'         => '',
                   ]);
                } else {
-                  $issue = new PluginFormcreatorIssue();
                   $issue->getFromDBByQuery("WHERE `sub_itemtype` = 'PluginFormcreatorForm_Answer' AND `original_id` = '$formAnswerId'");
                   $id = $this->getID();
                   $issue->update([
@@ -707,7 +706,6 @@ public function saveAnswers($data) {
                $ticket->getFromDB($itemTicket->getField('tickets_id'));
                $ticketId = $ticket->getID();
                if ($is_newFormAnswer) {
-                  $issue = new PluginFormcreatorIssue();
                   $issue->add([
                      'original_id'     => $ticketId,
                      'sub_itemtype'    => 'Ticket',
@@ -722,7 +720,6 @@ public function saveAnswers($data) {
                      'comment'         => addslashes($ticket->getField('content')),
                   ]);
                } else {
-                  $issue = new PluginFormcreatorIssue();
                   $issue->getFromDBByQuery("WHERE `sub_itemtype` = 'PluginFormcreatorForm_Answer' AND `original_id` = '$formAnswerId'");
                   $issue->update([
                      'id'              => $issue->getID(),
@@ -740,6 +737,14 @@ public function saveAnswers($data) {
                   ]);
                }
             }
+         } else {
+            $issue->getFromDBByQuery("WHERE `sub_itemtype` = 'PluginFormcreatorForm_Answer' AND `original_id` = '$formAnswerId'");
+            $issue->update([
+               'id'              => $issue->getID(),
+               'sub_itemtype'    => 'PluginFormcreatorForm_Answer',
+               'original_id'     => $formAnswerId,
+               'status'          => $status,
+            ]);
          }
       }