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-7337-tree-view-os-no-aparecen-not-init-modules' into 'develop' 

Fixed not showing agents with not init modules on os treeview

See merge request artica/pandorafms!4120
This commit is contained in:
Daniel Rodriguez 2021-05-27 16:22:47 +00:00
parent 791f007ff6 cb6f130ab0
commit be77599c07
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pandora_console/include/class/Tree.class.php
View File

@ -279,8 +279,10 @@ class Tree
protected function getTagJoin()
{
return 'INNER JOIN ttag_module ttm
ON tam.id_agente_modulo = ttm.id_agente_modulo';
return 'INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente
INNER JOIN ttag_module ttm
ON tam.id_agente_modulo = ttm.id_agente_modulo';
}
@ -931,11 +933,16 @@ class Tree
$agent_status_filter = $this->getAgentStatusFilter();
$module_search_filter = $this->getModuleSearchFilter();
$module_status_inner = '';
$module_status_filter = $this->getModuleStatusFilterFromTestado();
if (!empty($module_status_filter)) {
$module_status_inner = '
INNER JOIN tagente_estado tae
ON tae.id_agente_modulo = tam.id_agente_modulo';
$module_search_inner = '';
$module_search_filter = '';
if (!empty($this->filter['searchModule'])) {
$module_search_inner = '
INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente
INNER JOIN tagente_estado tae
ON tae.id_agente_modulo = tam.id_agente_modulo';
$module_search_filter = "AND tam.disabled = 0
AND tam.nombre LIKE '%%".$this->filter['searchModule']."%%' ".$this->getModuleStatusFilterFromTestado();
}
$sql_model = "SELECT %s FROM
@ -944,13 +951,11 @@ class Tree
FROM tagente ta
LEFT JOIN tagent_secondary_group tasg
ON ta.id_agente = tasg.id_agent
INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente
$inner_inside
$module_status_inner
$group_inner
$module_search_inner
WHERE ta.disabled = 0
AND tam.disabled = 0
%s
$agent_search_filter
$agent_status_filter
@ -973,6 +978,7 @@ class Tree
$inner
GROUP BY g
ORDER BY $order_by_final";
hd($sql, true);
return $sql;
}
@ -1020,7 +1026,7 @@ class Tree
$agent_search_filter = $this->getAgentSearchFilter();
$agent_status_filter = $this->getAgentStatusFilter();
$module_search_filter = $this->getModuleSearchFilter();
$module_status_filter = $this->getModuleStatusFilterFromTestado($this->filter['statusModule']);
$module_status_filter = $this->getModuleStatusFilter();
$condition = $this->L2condition;
$condition_inside = $this->L2conditionInside;

2
pandora_console/include/class/TreeModuleGroup.class.php
View File

@ -31,6 +31,8 @@ class TreeModuleGroup extends Tree
'tmg.id_mg AS id',
];
$this->L1inner = 'INNER JOIN tmodule_group tmg ON tmg.id_mg = x2.g';
$this->L1innerInside = 'INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente';
$this->L1orderByFinal = 'tmg.name';
$this->L2condition = 'AND tam.id_module_group = '.$this->rootID;

2
pandora_console/include/class/TreeTag.class.php
View File

@ -27,6 +27,8 @@ class TreeTag extends Tree
$this->L1fieldName = 'id_tag';
$this->L1fieldNameSql = 'ttm.id_tag';
$this->L1innerInside = '
INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente
INNER JOIN ttag_module ttm
ON ttm.id_agente_modulo = tam.id_agente_modulo
';