Merge branch 'support/2.13.0' into support/2.14.0

pluginsGLPI · Jan 25, 2024 · 7016b15 · 7016b15
2 parents 3061bc1 + 8e356d3
commit 7016b15
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/inc/issue.class.php b/inc/issue.class.php
@@ -542,6 +542,10 @@ public function rawSearchOptions() {
          'field'              => 'name',
          'name'               => __('Name'),
          'datatype'           => 'itemlink',
+         'searchtype'         => [
+            '0'                  => 'contains',
+            '1'                  => 'not contains',
+         ],
          'massiveaction'      => false,
          'additionalfields'   => [
             '0'                  => 'display_id'

diff --git a/tests/3-unit/PluginFormcreatorCategory.php b/tests/3-unit/PluginFormcreatorCategory.php
@@ -66,6 +66,7 @@ public function testGetTypeName($nb, $expected) {
    }
 
    public function testDefineTabs() {
+      $this->login('glpi', 'glpi');
       $instance = $this->newTestedInstance();
       $output = $instance->defineTabs();
       $expected = [

diff --git a/tests/3-unit/PluginFormcreatorForm.php b/tests/3-unit/PluginFormcreatorForm.php
@@ -302,6 +302,8 @@ public function testPrepareInputForUpdate($input, $expected, $expectedMessage) {
    }
 
    public function testDefineTabs() {
+      $this->login('glpi', 'glpi');
+      $_SESSION['glpishow_count_on_tabs'] = 0;
       $instance = $this->newTestedInstance();
       $output = $instance->defineTabs();
       $expected = [
@@ -314,6 +316,7 @@ public function testDefineTabs() {
          'PluginFormcreatorForm$3' => "Form answer properties",
          'PluginFormcreatorFormAnswer$1' => "Form answers",
          'PluginFormcreatorForm_Language$1' => 'Form languages',
+         'Document_Item$1' => "Documents",
          'Log$1' => "Historical",
       ];
       $this->array($output)