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-11371-bugs-vista-de-inventario' into 'develop' 

Ent 11371 bugs vista de inventario

See merge request artica/pandorafms!5967
This commit is contained in:
Rafael Ameijeiras 2023-05-30 09:33:01 +00:00
parent 6e27b7ce15 0c180f7ed3
commit a43146e494
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/include/functions_inventory.php
View File

@ -818,9 +818,16 @@ function inventory_get_datatable(
function get_data_basic_info_sql($params, $count=false) function get_data_basic_info_sql($params, $count=false)
{ {
$table = 'tagente';
if (is_metaconsole() === true) {
$table = 'tmetaconsole_agent';
}
$where = 'WHERE 1=1 '; $where = 'WHERE 1=1 ';
if ($params['id_agent'] > 0) { if ($params['id_agent'] > 0 && $count === true) {
$where .= sprintf(' AND id_agente = %d', $params['id_agent']); $where .= sprintf(' AND id_agente = %d', $params['id_agent']);
} else if ($params['id_agent'] > 0 && $count === false) {
$where .= sprintf(' AND %s.id_agente = %d', $table, $params['id_agent']);
} }
if ($params['id_group'] > 0) { if ($params['id_group'] > 0) {
@ -897,11 +904,6 @@ function get_data_basic_info_sql($params, $count=false)
$innerjoin = ''; $innerjoin = '';
$groupby = ''; $groupby = '';
$table = 'tagente';
if (is_metaconsole() === true) {
$table = 'tmetaconsole_agent';
}
if ($count !== true) { if ($count !== true) {
$fields = '*'; $fields = '*';
$innerjoin = 'LEFT JOIN tagente_estado ON '.$table.'.id_agente = tagente_estado.id_agente '; $innerjoin = 'LEFT JOIN tagente_estado ON '.$table.'.id_agente = tagente_estado.id_agente ';

2
pandora_console/operation/inventory/inventory.php
View File

@ -1041,9 +1041,9 @@ if ($inventory_module !== 'basic') {
<?php <?php
if ($order_by_agent === true) { if ($order_by_agent === true) {
foreach ($rows as $agent_rows) { foreach ($rows as $agent_rows) {
$data = [];
$modules = ''; $modules = '';
foreach ($agent_rows['row'] as $key_row => $row) { foreach ($agent_rows['row'] as $key_row => $row) {
$data = [];
$columns = explode(';', io_safe_output($row['data_format'])); $columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp'); array_push($columns, 'Timestamp');