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-8134-Tree-View-Tags-Falla-la-búsqueda-por-módulos' into 'develop' 

Ent 8134 tree view tags falla la búsqueda por módulos

See merge request artica/pandorafms!4500
This commit is contained in:
Daniel Rodriguez 2021-11-16 09:14:02 +00:00
parent 3e5b34325b 030938c78e
commit f2b9d1fbd2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -950,10 +950,9 @@ class Tree
$module_status_inner = ''; $module_status_inner = '';
$module_search_inner = ''; $module_search_inner = '';
$module_search_filter = ''; $module_search_filter = '';
if (!empty($this->filter['searchModule'])) { if (!empty($this->filter['searchModule'])) {
$module_search_inner = ' $module_search_inner = '
INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente
INNER JOIN tagente_estado tae INNER JOIN tagente_estado tae
ON tae.id_agente_modulo = tam.id_agente_modulo'; ON tae.id_agente_modulo = tam.id_agente_modulo';
$module_search_filter = "AND tam.disabled = 0 $module_search_filter = "AND tam.disabled = 0

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

@ -32,6 +32,8 @@ class TreeOS extends Tree
'tco.icon_name AS iconHTML', 'tco.icon_name AS iconHTML',
]; ];
$this->L1inner = 'INNER JOIN tconfig_os tco ON tco.id_os = x2.g'; $this->L1inner = 'INNER JOIN tconfig_os tco ON tco.id_os = x2.g';
$this->L1innerInside = 'INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente';
$this->L1orderByFinal = 'tco.name'; $this->L1orderByFinal = 'tco.name';
$this->L2condition = 'AND ta.id_os = '.$this->rootID; $this->L2condition = 'AND ta.id_os = '.$this->rootID;