fix(issue): self service is able to reopen a closed issue / ticket

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jul 16, 2020 · f90eafe · f90eafe
1 parent 3241430
commit f90eafe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/inc/issue.class.php b/inc/issue.class.php
@@ -186,9 +186,9 @@ public function displayExtended($options = []) {
       if ($item Instanceof PluginFormcreatorFormAnswer) {
          $item = $this->getTicketsForDisplay($options);
       }
+      unset($options['_item']);
 
-      $item->showTabsContent();
-
+      $item->showTabsContent($options);
    }
 
    /**
@@ -235,6 +235,7 @@ public function displaySimplified($options = []) {
       if ($item Instanceof PluginFormcreatorFormAnswer) {
          $item = $this->getTicketsForDisplay($options);
       }
+      unset($options['_item']);
 
       // force recall of ticket in layout
       $old_layout = $_SESSION['glpilayout'];
@@ -265,7 +266,7 @@ public function displaySimplified($options = []) {
          // No ticket associated to this issue or multiple tickets
          // Show the form answers
          echo '<div class"center">';
-         $item->showTabsContent();
+         $item->showTabsContent($options);
          echo '</div>';
       }
 

diff --git a/setup.php b/setup.php
@@ -183,12 +183,15 @@ function plugin_init_formcreator() {
             if (strpos($_SERVER['REQUEST_URI'], "front/ticket.form.php") !== false) {
                if (!isset($_POST['update'])) {
                   $decodedUrl = [];
-                  $forceTab = '';
+                  $openItilFollowup = '';
+                  if (isset($_GET['_openfollowup'])) {
+                     $openItilFollowup = '&_openfollowup=1';
+                  }
                   parse_str($_SERVER['QUERY_STRING'], $decodedUrl);
                   if (isset($decodedUrl['forcetab'])) {
                      Session::setActiveTab(Ticket::class, $decodedUrl['forcetab']);
                   }
-                  Html::redirect(FORMCREATOR_ROOTDOC . '/front/issue.form.php?id=' . $_GET['id'] . '&sub_itemtype=Ticket' . $forceTab);
+                  Html::redirect(FORMCREATOR_ROOTDOC . '/front/issue.form.php?id=' . $_GET['id'] . '&sub_itemtype=Ticket' . $openItilFollowup);
                }
             }