Fix search options

glpi-project · Sep 24, 2019 · b32c8a7 · b32c8a7
1 parent 1ff20da
commit b32c8a7
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 20 deletions.
diff --git a/inc/certificate.class.php b/inc/certificate.class.php
@@ -261,7 +261,7 @@ function rawSearchOptions() {
       ];
 
       $tab[] = [
-         'id'                 => '50',
+         'id'                 => '61',
          'table'              => $this->getTable(),
          'field'              => 'template_name',
          'name'               => __('Template name'),

diff --git a/inc/computer.class.php b/inc/computer.class.php
@@ -754,7 +754,7 @@ function rawSearchOptions() {
       ];
 
       $tab[] = [
-         'id'                 => '50',
+         'id'                 => '65',
          'table'              => $this->getTable(),
          'field'              => 'template_name',
          'name'               => __('Template name'),

diff --git a/inc/ipnetwork.class.php b/inc/ipnetwork.class.php
@@ -86,16 +86,6 @@ function rawSearchOptions() {
          'datatype'           => 'string'
       ];
 
-      $tab[] = [
-         'id'                 => '13',
-         'table'              => $this->getTable(),
-         'field'              => 'network',
-         'name'               => self::getTypeName(1),
-         'massiveaction'      => false,
-         'datatype'           => 'string',
-         'autocomplete'       => true,
-      ];
-
       $tab[] = [
          'id'                 => '17',
          'table'              => $this->getTable(),

diff --git a/inc/monitor.class.php b/inc/monitor.class.php
@@ -615,7 +615,7 @@ function rawSearchOptions() {
       ];
 
       $tab[] = [
-         'id'                 => '50',
+         'id'                 => '61',
          'table'              => $this->getTable(),
          'field'              => 'template_name',
          'name'               => __('Template name'),

diff --git a/inc/networkequipment.class.php b/inc/networkequipment.class.php
@@ -637,7 +637,7 @@ function rawSearchOptions() {
       ];
 
       $tab[] = [
-         'id'                 => '50',
+         'id'                 => '65',
          'table'              => $this->getTable(),
          'field'              => 'template_name',
          'name'               => __('Template name'),

diff --git a/inc/peripheral.class.php b/inc/peripheral.class.php
@@ -523,7 +523,7 @@ function rawSearchOptions() {
       ];
 
       $tab[] = [
-         'id'                 => '50',
+         'id'                 => '61',
          'table'              => $this->getTable(),
          'field'              => 'template_name',
          'name'               => __('Template name'),

diff --git a/inc/phone.class.php b/inc/phone.class.php
@@ -594,7 +594,7 @@ function rawSearchOptions() {
       ];
 
       $tab[] = [
-         'id'                 => '50',
+         'id'                 => '61',
          'table'              => $this->getTable(),
          'field'              => 'template_name',
          'name'               => __('Template name'),

diff --git a/inc/printer.class.php b/inc/printer.class.php
@@ -794,7 +794,7 @@ function rawSearchOptions() {
       ];
 
       $tab[] = [
-         'id'                 => '50',
+         'id'                 => '61',
          'table'              => $this->getTable(),
          'field'              => 'template_name',
          'name'               => __('Template name'),

diff --git a/tests/functionnal/AuthLdap.php b/tests/functionnal/AuthLdap.php
@@ -254,7 +254,7 @@ public function testDefineTabs() {
    public function testGetSearchOptionsNew() {
       $ldap     = new \AuthLDAP();
       $options  = $ldap->rawSearchOptions();
-      $this->array($options)->hasSize(32);
+      $this->array($options)->hasSize(33);
    }
 
    public function testGetSyncFields() {

diff --git a/tests/functionnal/Software.php b/tests/functionnal/Software.php
@@ -413,10 +413,10 @@ public function testGetSpecificMassiveActions() {
    public function testGetSearchOptionsNew() {
       $software = new \Software();
       $result   = $software->rawSearchOptions();
-      $this->array($result)->hasSize(39);
+      $this->array($result)->hasSize(40);
 
       $this->login();
       $result   = $software->rawSearchOptions();
-      $this->array($result)->hasSize(48);
+      $this->array($result)->hasSize(49);
    }
 }