feat: Improve browser tabs names

pluginsGLPI · Dec 16, 2021 · 58a9b04 · 58a9b04
1 parent e075fef
commit 58a9b04
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 9 deletions.
diff --git a/front/issue.form.php b/front/issue.form.php
@@ -57,18 +57,43 @@
 PluginFormcreatorCommon::saveLayout();
 $_SESSION['glpilayout'] = "lefttab";
 
-if (Session::getCurrentInterface() == "helpdesk") {
-   Html::helpHeader(__('Service catalog', 'formcreator'));
-} else {
-   Html::header(__('Service catalog', 'formcreator'));
-}
 /** @var PluginFormcreatorIssue $issue */
 $issue = PluginFormcreatorIssue::getById((int) $_REQUEST['id']);
-if ($issue === false) {
+
+if ($issue) {
+   $itemtype = $issue->fields['itemtype'];
+
+   // Trick to change the displayed id as Html::includeHeader() rely on request data
+   $old_id = $_GET['id'];
+   $_GET['id'] = $issue->fields['display_id'];
+
+   // Specific case, viewing a ticket from a formanswer result
+   if ($itemtype == PluginFormcreatorFormAnswer::class && isset($_GET['tickets_id'])) {
+      $itemtype = Ticket::class;
+      $_GET['id'] = "f_$_GET[tickets_id]";
+   }
+
+   $header = $itemtype::getTypeName(1);
+   if (Session::getCurrentInterface() == "helpdesk") {
+      Html::helpHeader($header);
+   } else {
+      Html::header($header);
+   }
+
+   // Reset request param in case some other code depends on it
+   $_GET['id'] = $old_id;
+
+   $issue->display($_REQUEST);
+} else {
+   $header = __('Item not found');
+   if (Session::getCurrentInterface() == "helpdesk") {
+      Html::helpHeader($header);
+   } else {
+      Html::header($header);
+   }
    PluginFormcreatorCommon::restoreLayout();
    Html::displayNotFoundError();
 }
-$issue->display($_REQUEST);
 
 if (Session::getCurrentInterface() == "helpdesk") {
    Html::helpFooter();

diff --git a/inc/issue.class.php b/inc/issue.class.php
@@ -803,8 +803,13 @@ public static function giveItem($itemtype, $option_id, $data, $num) {
                default:
                   $content = '';
             }
-            $link = self::getFormURLWithID($id) . "&itemtype=".$data['raw']['itemtype'];
-            $link =  self::getFormURLWithID($data['id']);
+            $link = self::getFormURLWithID($data['id']);
+
+            // Show "final" item id in the URL
+            if (Toolbox::isCommonDBTM($subItemtype)) {
+               $link .= "&" . $subItemtype::getForeignKeyField() . "=$id";
+            }
+
             $key = 'id';
             $tooltip = Html::showToolTip(nl2br(RichText::getTextFromHtml($content)), [
                'applyto' => $itemtype.$data['raw'][$key],