Skip to content

Commit b748182

Browse files
committed
fix(issue): access to saved searches from service catalog
1 parent c81872e commit b748182

File tree

4 files changed

+47
-17
lines changed

4 files changed

+47
-17
lines changed

front/issue.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@
4040
Html::displayRightError();
4141
}
4242
if (Session::getCurrentInterface() == "helpdesk") {
43-
Html::helpHeader(__('Service catalog', 'formcreator'));
43+
Html::helpHeader(
44+
__('Service catalog', 'formcreator'),
45+
'my_assistance_requests',
46+
PluginFormcreatorIssue::class
47+
);
4448
} else {
4549
Html::header(
4650
__('Service catalog', 'formcreator'),

inc/common.class.php

+9
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,15 @@ public static function hookRedefineMenu($menus) {
783783
'default' => PluginFormcreatorIssue::getSearchURL(false),
784784
'title' => __('My requests for assistance', 'formcreator'),
785785
'icon' => 'fa-fw ti ti-list',
786+
'content' => [
787+
PluginFormcreatorIssue::class => [
788+
'title' => __('My requests for assistance', 'formcreator'),
789+
'icon' => 'fa-fw ti ti-list',
790+
'links' => [
791+
'lists' => '',
792+
],
793+
],
794+
],
786795
];
787796

788797
if (PluginFormcreatorEntityConfig::getUsedConfig('is_kb_separated', Session::getActiveEntity()) == PluginFormcreatorEntityConfig::CONFIG_KB_DISTINCT

setup.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ function plugin_formcreator_hook(): void {
349349
];
350350
}
351351
if (strpos($_SERVER['REQUEST_URI'], 'issue.php') !== false) {
352-
$CFG_GLPI['javascript']['self-service']['none'] = [
352+
$CFG_GLPI['javascript']['my_assistance_requests'][PluginFormcreatorIssue::class] = [
353353
'dashboard',
354354
'gridstack'
355355
];
@@ -364,6 +364,7 @@ function plugin_formcreator_hook(): void {
364364
}
365365

366366
$PLUGIN_HOOKS['menu_toadd']['formcreator']['helpdesk'] = PluginFormcreatorFormlist::class;
367+
$PLUGIN_HOOKS['menu_toadd']['formcreator']['my_assistance_requests'] = PluginFormcreatorIssue::class;
367368

368369
// Massive Action definition
369370
$PLUGIN_HOOKS['use_massive_action']['formcreator'] = 1;

tests/3-unit/PluginFormcreatorCommon.php

+31-15
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
*/
3131
namespace tests\units;
3232
use GlpiPlugin\Formcreator\Tests\CommonTestCase;
33+
use PluginFormcreatorIssue;
3334
use Ticket;
3435
use User;
3536

@@ -572,23 +573,29 @@ public function providerHookRedefineMenu() {
572573
yield [
573574
'input' => \Html::generateHelpMenu(),
574575
'expected' => [
575-
'seek_assistance' =>
576-
[
577-
'default' => 'plugins/formcreator/front/wizard.php',
578-
'title' => 'Seek assistance',
579-
'icon' => 'fa-fw ti ti-headset',
576+
'seek_assistance' => [
577+
'default' => 'plugins/formcreator/front/wizard.php',
578+
'title' => 'Seek assistance',
579+
'icon' => 'fa-fw ti ti-headset',
580580
],
581-
'my_assistance_requests' =>
582-
[
583-
'default' => '/plugins/formcreator/front/issue.php',
584-
'title' => 'My requests for assistance',
585-
'icon' => 'fa-fw ti ti-list',
581+
'my_assistance_requests' => [
582+
'default' => '/plugins/formcreator/front/issue.php',
583+
'title' => 'My requests for assistance',
584+
'icon' => 'fa-fw ti ti-list',
585+
'content' => [
586+
PluginFormcreatorIssue::class => [
587+
'title' => __('My requests for assistance', 'formcreator'),
588+
'icon' => 'fa-fw ti ti-list',
589+
'links' => [
590+
'lists' => '',
591+
],
592+
],
593+
],
586594
],
587-
'reservation' =>
588-
[
589-
'default' => '/front/reservationitem.php',
590-
'title' => 'Reservations',
591-
'icon' => 'ti ti-calendar-event',
595+
'reservation' => [
596+
'default' => '/front/reservationitem.php',
597+
'title' => 'Reservations',
598+
'icon' => 'ti ti-calendar-event',
592599
],
593600
]
594601
];
@@ -619,6 +626,15 @@ public function providerHookRedefineMenu() {
619626
'default' => '/plugins/formcreator/front/issue.php',
620627
'title' => 'My requests for assistance',
621628
'icon' => 'fa-fw ti ti-list',
629+
'content' => [
630+
PluginFormcreatorIssue::class => [
631+
'title' => __('My requests for assistance', 'formcreator'),
632+
'icon' => 'fa-fw ti ti-list',
633+
'links' => [
634+
'lists' => '',
635+
],
636+
],
637+
],
622638
],
623639
'reservation' =>
624640
[

0 commit comments

Comments
 (0)