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

#12686 fixed filter in tree module group

Browse Source
This commit is contained in:
Daniel Cebrian 2023-12-26 17:22:19 +01:00
parent 83c6d3735e
commit 590c7f7480
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,7 +304,7 @@ class Tree
} }
$filter_status = ''; $filter_status = '';
if ((int) $this->filter['statusModule'] !== -1 && $this->type === 'module') { if ((int) $this->filter['statusModule'] !== -1 && ($this->type === 'module' || $this->type === 'module_group')) {
$filter_status = ' AND tae.estado = '.$this->filter['statusModule']; $filter_status = ' AND tae.estado = '.$this->filter['statusModule'];
} }

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

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