tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 07:44:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13391-vista-de-inventario-basic-info-no-muestra-agentes-que-no-tienen-modulos' into 'develop'

Browse Source 
Ent 13391 Vista de inventario ( Basic info ) no muestra agentes que no tienen modulos

See merge request artica/pandorafms!7159
This commit is contained in:
Jose Martin 2024-04-09 14:38:46 +00:00
commit 7fc79df497
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@ if ($custom_date === '1') {
} }
} else { } else {
$date_end = date('Y/m/d H:i:s'); $date_end = date('Y/m/d H:i:s');
$date_init = date('Y/m/d H:i:s', (strtotime($date_end) - $range)); $date_init = date('Y/m/d H:i:s', (strtotime($date_end) - (int) $range));
$period = (strtotime($date_end) - strtotime($date_init)); $period = (strtotime($date_end) - strtotime($date_init));
} }
@ -181,6 +181,8 @@ if (is_ajax() === true) {
$order = get_datatable_order(); $order = get_datatable_order();
$id_agent = (int) get_parameter('id_agent', 0); $id_agent = (int) get_parameter('id_agent', 0);
$id_group = (int) get_parameter('id_group', 0); $id_group = (int) get_parameter('id_group', 0);
$utimestamp = (int) get_parameter('utimestamp', 0);
$period = (int) get_parameter('period', 0);
if (isset($filter['value']) === false) { if (isset($filter['value']) === false) {
$filter['value'] = ''; $filter['value'] = '';
@ -1387,6 +1389,8 @@ if ($inventory_module !== 'basic') {
'id_group' => $inventory_id_group, 'id_group' => $inventory_id_group,
'search' => $search, 'search' => $search,
'status' => $status_agent, 'status' => $status_agent,
'utimestamp' => (($range !== 'none') ? $utimestamp : 0),
'period' => $period,
], ],
'zeroRecords' => __('Agent info not found'), 'zeroRecords' => __('Agent info not found'),
'emptyTable' => __('Agent info not found'), 'emptyTable' => __('Agent info not found'),