feat(agent,fleet): agents and fleets are searchable by a applied poli…

…cy criteria Signed-off-by: Thierry Bugier <tbugier@teclib.com>
flyve-mdm · May 18, 2018 · 0ebb39a · 0ebb39a
1 parent 30e1916
commit 0ebb39a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 30 deletions.
diff --git a/inc/agent.class.php b/inc/agent.class.php
@@ -877,6 +877,28 @@ public function getSearchOptionsNew() {
          'datatype'           => 'dropdown'
       ];
 
+      $tab[] = [
+         'id'                 => '18',
+         'table'              => 'glpi_plugin_flyvemdm_policies',
+         'field'              => 'name',
+         'name'               => __('Applied policy', 'flyvemdm'),
+         'datatype'           => 'dropdown',
+         'comments'           => '1',
+         'nosort'             => true,
+         'joinparams'         => [
+            'beforejoin'         => [
+               'table'           => 'glpi_plugin_flyvemdm_tasks',
+               'joinparams'      => [
+                  'jointype'     => 'child',
+                  'linkfield'    => 'items_id_applied',
+                  'condition'    => "AND NEWTABLE.`itemtype_applied`='" . PluginFlyvemdmAgent::class . "'",
+               ],
+            ],
+            'jointype'           => 'empty',
+         ],
+         'massiveaction'      => false
+      ];
+
       return $tab;
    }
 

diff --git a/inc/fleet.class.php b/inc/fleet.class.php
@@ -246,38 +246,23 @@ public function getSearchOptionsNew() {
 
       $tab[] = [
          'id'                 => '3',
-         'table'              => 'glpi_plugin_flyvemdm_tasks',
-         'field'              => 'items_id',
-         'name'               => __('Associated elements'),
-         'datatype'           => 'specific',
+         'table'              => 'glpi_plugin_flyvemdm_policies',
+         'field'              => 'name',
+         'name'               => __('Applied policy', 'flyvemdm'),
+         'datatype'           => 'dropdown',
          'comments'           => '1',
          'nosort'             => true,
-         'nosearch'           => true,
-         'additionalfields'   => [
-            '0'                  => 'itemtype'
-         ],
-         'joinparams'         => [
-            'jointype'           => 'child'
-         ],
-         'forcegroupby'       => true,
-         'massiveaction'      => false
-      ];
-
-      $tab[] = [
-         'id'                 => '4',
-         'table'              => 'glpi_plugin_flyvemdm_tasks',
-         'field'              => 'itemtype',
-         'name'               => __('Associated item types'),
-         'datatype'           => 'itemtypename',
-         'itemtype_list'      => 'notifiable_types',
-         'nosort'             => true,
-         'additionalfields'   => [
-            '0'                  => 'itemtype'
-         ],
          'joinparams'         => [
-            'jointype'           => 'child'
+            'beforejoin'         => [
+               'table'           => 'glpi_plugin_flyvemdm_tasks',
+               'joinparams'      => [
+                  'jointype'     => 'child',
+                  'linkfield'    => 'items_id_applied',
+                  'condition'    => "AND NEWTABLE.`itemtype_applied`='" . PluginFlyvemdmFleet::class . "'",
+               ],
+            ],
+            'jointype'           => 'empty',
          ],
-         'forcegroupby'       => true,
          'massiveaction'      => false
       ];
 

diff --git a/setup.php b/setup.php
@@ -99,8 +99,6 @@ function plugin_init_flyvemdm() {
       plugin_flyvemdm_registerClasses();
       plugin_flyvemdm_addHooks();
 
-      $CFG_GLPI['notifiable_types'] = [PluginFlyvemdmFleet::class, PluginFlyvemdmAgent::class];
-
       Html::requireJs('charts');
       $PLUGIN_HOOKS['add_css']['flyvemdm'][] = "css/style.css";
       // Warning 'pluginflyvemdmmenu' MUST be lower case