tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-10602-Inventory-widget-2' into 'develop' 

Ent 10602 inventory widget 2

See merge request artica/pandorafms!6589
This commit is contained in:
Rafael Ameijeiras 2023-10-25 11:07:55 +00:00
parent f89a31e421 82d6770ff1
commit 50d3139dc7
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_console/include/lib/Dashboard/Widgets/inventory.php
View File

@ -30,6 +30,8 @@ namespace PandoraFMS\Dashboard;
global $config;
require_once $config['homedir'].'/include/functions_inventory.php';
/**
* Inventory Widget.
*/
@ -608,7 +610,7 @@ class InventoryWidget extends Widget
}
}
$id_table = 'id_'.$row['id_module_inventory'].'_'.$nodo['server_uid'];
$id_table = 'id_'.$row['id_module_inventory'].'_'.uniqid().'_'.$nodo['server_uid'];
$table = ui_print_datatable(
[
'id' => $id_table,
@ -619,7 +621,7 @@ class InventoryWidget extends Widget
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'frtilp',
'dom_elements' => 'rtilp',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
@ -727,7 +729,7 @@ class InventoryWidget extends Widget
}
}
$id_table = 'id_'.$row['id_module_inventory'].'_'.$nodo['server_uid'];
$id_table = 'id_'.$row['id_module_inventory'].'_'.uniqid().'_'.$nodo['server_uid'];
$table = ui_print_datatable(
[
@ -739,7 +741,7 @@ class InventoryWidget extends Widget
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'frtilp',
'dom_elements' => 'rtilp',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
@ -893,7 +895,7 @@ class InventoryWidget extends Widget
}
}
$id_table = 'id_'.$key_row.'_'.$row['id_module_inventory'].'_'.$row['id_agente'];
$id_table = 'id_'.$key_row.'_'.$row['id_module_inventory'].'_'.uniqid().'_'.$row['id_agente'];
$table = ui_print_datatable(
[
@ -905,7 +907,7 @@ class InventoryWidget extends Widget
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'frtilp',
'dom_elements' => 'rtilp',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
@ -985,7 +987,7 @@ class InventoryWidget extends Widget
array_push($data, $data_tmp);
}
$id_table = 'id_'.$row['id_module_inventory'];
$id_table = 'id_'.$row['id_module_inventory'].'_'.uniqid();
}
if ($count_rows > 1) {
@ -999,7 +1001,7 @@ class InventoryWidget extends Widget
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'frtilp',
'dom_elements' => 'rtilp',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
@ -1035,7 +1037,7 @@ class InventoryWidget extends Widget
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'frtilp',
'dom_elements' => 'rtilp',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
@ -1098,7 +1100,7 @@ class InventoryWidget extends Widget
'columns' => $columns,
'column_names' => $columns_names,
'ordering' => $ordering,
'dom_elements' => 'frtilp',
'dom_elements' => 'rtilp',
'searching' => $searching,
'order' => [
'field' => $columns[0],

1
pandora_console/operation/agentes/ver_agente.php
View File

@ -36,6 +36,7 @@ require_once $config['homedir'].'/include/functions_agents.php';
require_once $config['homedir'].'/include/functions_groups.php';
require_once $config['homedir'].'/include/functions_modules.php';
require_once $config['homedir'].'/include/functions_users.php';
require_once $config['homedir'].'/include/functions_inventory.php';
enterprise_include_once('include/functions_metaconsole.php');
enterprise_include_once('include/functions_omnishell.php');