fix(wizard): consistent breadcrumb on several pages

btry · btry · commit 6639cda033f9 · 2022-11-02T09:46:17.000+01:00
diff --git a/front/formlist.php b/front/formlist.php
@@ -42,7 +42,11 @@
    if (plugin_formcreator_replaceHelpdesk()) {
       Html::redirect('issue.php');
    } else {
-      Html::helpHeader(__('Form list', 'formcreator'));
+      Html::helpHeader(
+         __('Form list', 'formcreator'),
+         'seek_assistance',
+         PluginFormcreatorForm::class
+      );
    }
 } else {
    Html::header(__('Form list', 'formcreator'));
diff --git a/front/knowbaseitem.php b/front/knowbaseitem.php
@@ -38,7 +38,11 @@
 }
 
 if (Session::getCurrentInterface() == 'helpdesk') {
-   Html::helpHeader(__('Service catalog', 'formcreator'));
+   Html::helpHeader(
+      __('Service catalog', 'formcreator'),
+      'faq',
+      PluginFormcreatorForm::class
+   );
 } else {
    Html::header(__('Service catalog', 'formcreator'));
 }
diff --git a/front/wizard.php b/front/wizard.php
@@ -41,7 +41,11 @@
 }
 
 if (Session::getCurrentInterface() == "helpdesk") {
-   Html::helpHeader(__('Service catalog', 'formcreator'));
+   Html::helpHeader(
+      __('Service catalog', 'formcreator'),
+      'seek_assistance',
+      PluginFormcreatorForm::class
+   );
 } else {
    Html::header(__('Service catalog', 'formcreator'));
 }
diff --git a/inc/common.class.php b/inc/common.class.php
@@ -682,7 +682,11 @@ public static function header() {
       switch (self::getInterface()) {
          case "servicecatalog":
          case "self-service":
-            return Html::helpHeader(__('Form list', 'formcreator'), $_SERVER['PHP_SELF']);
+            return Html::helpHeader(
+               __('Form list', 'formcreator'),
+               'seek_assistance',
+               PluginFormcreatorForm::class
+            );
          case "central":
             return Html::header(
                __('Form Creator', 'formcreator'),
diff --git a/setup.php b/setup.php
@@ -340,10 +340,9 @@ function plugin_formcreator_hook(): void {
          if (strpos($_SERVER['REQUEST_URI'], 'helpdesk') !== false
                || strpos($_SERVER['REQUEST_URI'], 'central.php') !== false
                || strpos($_SERVER['REQUEST_URI'], 'formcreator/front/formlist.php') !== false
-               || strpos($_SERVER['REQUEST_URI'], 'formcreator/front/knowbaseitem.php') !== false
                || strpos($_SERVER['REQUEST_URI'], 'formcreator/front/wizard.php') !== false) {
             $PLUGIN_HOOKS[Hooks::ADD_JAVASCRIPT]['formcreator'][] = 'lib/jquery-slinky/dist/slinky.min.js';
-            $CFG_GLPI['javascript']['self-service']['none'] = [
+            $CFG_GLPI['javascript']['seek_assistance'][PluginFormcreatorForm::class] = [
                'dashboard',
                'gridstack'
             ];
@@ -354,6 +353,19 @@ function plugin_formcreator_hook(): void {
                'gridstack'
             ];
          }
+         if (strpos($_SERVER['REQUEST_URI'], 'formdisplay.php') !== false) {
+            $CFG_GLPI['javascript']['seek_assistance'][PluginFormcreatorForm::class] = [
+               'dashboard',
+               'gridstack'
+            ];
+         }
+         if (strpos($_SERVER['REQUEST_URI'], 'knowbaseitem.php') !== false) {
+            $PLUGIN_HOOKS[Hooks::ADD_JAVASCRIPT]['formcreator'][] = 'lib/jquery-slinky/dist/slinky.min.js';
+            $CFG_GLPI['javascript']['faq'][PluginFormcreatorForm::class] = [
+               'dashboard',
+               'gridstack'
+            ];
+         }
       }
    }
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,11 @@`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`if (Session::getCurrentInterface() == 'helpdesk') {`
`41`		`- Html::helpHeader(__('Service catalog', 'formcreator'));`
	`41`	`+ Html::helpHeader(`
	`42`	`+ __('Service catalog', 'formcreator'),`
	`43`	`+ 'faq',`
	`44`	`+ PluginFormcreatorForm::class`
	`45`	`+ );`
`42`	`46`	`} else {`
`43`	`47`	`Html::header(__('Service catalog', 'formcreator'));`
`44`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,11 @@`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`if (Session::getCurrentInterface() == "helpdesk") {`
`44`		`- Html::helpHeader(__('Service catalog', 'formcreator'));`
	`44`	`+ Html::helpHeader(`
	`45`	`+ __('Service catalog', 'formcreator'),`
	`46`	`+ 'seek_assistance',`
	`47`	`+ PluginFormcreatorForm::class`
	`48`	`+ );`
`45`	`49`	`} else {`
`46`	`50`	`Html::header(__('Service catalog', 'formcreator'));`
`47`	`51`	`}`