[0.90]fix force tab if ticket timeline - see #455

glpi-project · Feb 12, 2016 · 68cdf80 · 68cdf80
1 parent 60d3799
commit 68cdf80
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/inc/notificationtargetcommonitilobject.class.php b/inc/notificationtargetcommonitilobject.class.php
@@ -9,7 +9,7 @@
 
  based on GLPI - Gestionnaire Libre de Parc Informatique
  Copyright (C) 2003-2014 by the INDEPNET Development Team.
- 
+
  -------------------------------------------------------------------------
 
  LICENSE
@@ -656,10 +656,14 @@ function getDatasForObject(CommonDBTM $item, array $options, $simple=false) {
                            = $this->formatURL($options['additionnaloption']['usertype'],
                                               $objettype."_".$item->getField("id"));
 
+      $tab = '$2';
+      if ($_SESSION['glpiticket_timeline'] == 1) {
+         $tab = '$1';
+      }
       $datas["##$objettype.urlapprove##"]
                            = $this->formatURL($options['additionnaloption']['usertype'],
                                               $objettype."_".$item->getField("id")."_".
-                                                        $item->getType().'$2');
+                                                        $item->getType().$tab);
 
 
       $entity = new Entity();