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-12943-guardia17145-error-sql-al-hacer-click-en-las-columnas-del-inventario' into 'develop' 

Ent 12943 [GUARDIA][#17145]Error SQL al hacer click en las columnas del inventario.

See merge request artica/pandorafms!6971
This commit is contained in:
Rafael Ameijeiras 2024-02-29 08:11:25 +00:00
parent 6f808edea0 70818c40b1
commit ef8d2cf63c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_inventory.php
View File

@ -982,7 +982,12 @@ function get_data_basic_info_sql($params, $count=false)
$groupby = '';
if ($count !== true) {
$fields = '*';
if (is_metaconsole() === true) {
$fields = 'tmetaconsole_agent.*, tagent_secondary_group.*, tagent_custom_data.*';
} else {
$fields = 'tagente.*, tagent_secondary_group.*, tagent_custom_data.*';
}
$innerjoin = 'LEFT JOIN tagente_estado ON '.$table.'.id_agente = tagente_estado.id_agente ';
$innerjoin .= 'LEFT JOIN tagent_secondary_group ON '.$table.'.id_agente = tagent_secondary_group.id_agent ';
$innerjoin .= 'LEFT JOIN tagent_custom_data ON '.$table.'.id_agente = tagent_custom_data.id_agent ';