fix(search): update search options fields for Flyvemdm ItemTypes

flyve-mdm · Jan 25, 2018 · 93e94c7 · 93e94c7
1 parent 7f52837
commit 93e94c7
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 55 deletions.
diff --git a/inc/agent.class.php b/inc/agent.class.php
@@ -732,6 +732,20 @@ public function post_purgeItem() {
    public function getSearchOptionsNew() {
       $tab = parent::getSearchOptionsNew();
 
+      $tab[0] = [
+         'id'   => 'common',
+         'name' => __('Agent', 'flyvemdm'),
+      ];
+
+      $tab[] = [
+         'id'                 => '2',
+         'table'              => $this->getTable(),
+         'field'              => 'id',
+         'name'               => __('ID'),
+         'massiveaction'      => false,
+         'datatype'           => 'number'
+      ];
+
       $tab[] = [
          'id'                 => '3',
          'table'              => 'glpi_plugin_flyvemdm_fleets',

diff --git a/inc/file.class.php b/inc/file.class.php
@@ -278,22 +278,13 @@ protected function createEntityDirectory($dir) {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = [];
+      $tab = parent::getSearchOptionsNew();
 
-      $tab[] = [
+      $tab[0] = [
          'id'   => 'common',
          'name' => __s('File', 'flyvemdm'),
       ];
 
-      $tab[] = [
-         'id'            => '1',
-         'table'         => $this->getTable(),
-         'field'         => 'name',
-         'name'          => __('Name'),
-         'datatype'      => 'itemlink',
-         'massiveaction' => false,
-      ];
-
       $tab[] = [
          'id'            => '2',
          'table'         => $this->getTable(),

diff --git a/inc/fleet.class.php b/inc/fleet.class.php
@@ -228,22 +228,13 @@ public function pre_deleteItem() {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = [];
+      $tab = parent::getSearchOptionsNew();
 
-      $tab[] = [
+      $tab[0] = [
          'id'                 => 'common',
          'name'               => __s('Fleet', 'flyvemdm')
       ];
 
-      $tab[] = [
-         'id'                 => '1',
-         'table'              => $this->getTable(),
-         'field'              => 'name',
-         'name'               => __('Name'),
-         'datatype'           => 'itemlink',
-         'massiveaction'      => false
-      ];
-
       $tab[] = [
          'id'                 => '2',
          'table'              => $this->getTable(),

diff --git a/inc/package.class.php b/inc/package.class.php
@@ -363,22 +363,13 @@ protected function createEntityDirectory($dir) {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = [];
+      $tab = parent::getSearchOptionsNew();
 
-      $tab[] = [
+      $tab[0] = [
          'id'   => 'common',
          'name' => __s('Package', 'flyvemdm'),
       ];
 
-      $tab[] = [
-         'id'            => '1',
-         'table'         => $this->getTable(),
-         'field'         => 'name',
-         'name'          => __('Name'),
-         'datatype'      => 'itemlink',
-         'massiveaction' => false,
-      ];
-
       $tab[] = [
          'id'            => '2',
          'table'         => $this->getTable(),

diff --git a/inc/policy.class.php b/inc/policy.class.php
@@ -91,22 +91,13 @@ static function getTypeName($nb = 0) {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = [];
+      $tab = parent::getSearchOptionsNew();
 
-      $tab[] = [
+      $tab[0] = [
          'id'   => 'common',
          'name' => __('Policy', 'flyvemdm'),
       ];
 
-      $tab[] = [
-         'id'            => '1',
-         'table'         => $this->getTable(),
-         'field'         => 'name',
-         'name'          => __('Name'),
-         'datatype'      => 'itemlink',
-         'massiveaction' => false,
-      ];
-
       $tab[] = [
          'id'            => '2',
          'table'         => $this->getTable(),

diff --git a/inc/wellknownpath.class.php b/inc/wellknownpath.class.php
@@ -74,22 +74,13 @@ public function prepareInputForUpdate($input) {
     * @return array
     */
    public function getSearchOptionsNew() {
-      $tab = [];
+      $tab = parent::getSearchOptionsNew();
 
-      $tab[] = [
+      $tab[0] = [
          'id'   => 'common',
          'name' => __('Well known path', 'flyvemdm'),
       ];
 
-      $tab[] = [
-         'id'            => '1',
-         'table'         => $this->getTable(),
-         'field'         => 'name',
-         'name'          => __('Name'),
-         'datatype'      => 'itemlink',
-         'massiveaction' => false,
-      ];
-
       $tab[] = [
          'id'            => '2',
          'table'         => $this->getTable(),