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-12684-vista-tree-view-no-filtra-por-modulo-en-algunas-pestanas' into 'develop' 

Ent 12684 vista tree view no filtra por modulo en algunas pestanas

See merge request artica/pandorafms!6813
This commit is contained in:
Rafael Ameijeiras 2023-12-27 14:01:25 +00:00
parent c7d34b1308 696ca72a80
commit dd4129a136
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/ajax/tree.ajax.php
View File

@ -214,7 +214,9 @@ if (is_ajax() === true) {
$tree->setFilter($filter); $tree->setFilter($filter);
ob_clean(); ob_clean();
echo json_encode(['success' => 1, 'tree' => $tree->getArray()]); $tree_json = json_encode(['success' => 1, 'tree' => $tree->getArray()]);
echo $tree_json;
return; return;
} }

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

@ -126,11 +126,12 @@ class Tree
public function setFilter($filter) public function setFilter($filter)
{ {
// There is not module filter in metaconsole. // There is not module filter in metaconsole.
/* if (is_metaconsole()) {
if (is_metaconsole()) { $filter['searchMetaconsoleModule'] = $filter['searchModule'];
$filter['searchModule'] = ''; $filter['searchModule'] = '';
$filter['statusMetaconsoleModule'] = $filter['statusModule'];
$filter['statusModule'] = self::TV_DEFAULT_AGENT_STATUS; $filter['statusModule'] = self::TV_DEFAULT_AGENT_STATUS;
}*/ }
$this->filter = $filter; $this->filter = $filter;
} }
@ -1067,11 +1068,9 @@ class Tree
$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_estado tae $module_search_filter = "AND tam.disabled = 0
ON tae.id_agente_modulo = tam_inner.id_agente_modulo'; AND tam.nombre LIKE '%%".$this->filter['searchModule']."%%' ".$this->getModuleStatusFilterFromTestado();
$module_search_filter = "AND tam_inner.disabled = 0
AND tam_inner.nombre LIKE '%%".$this->filter['searchModule']."%%' ".$this->getModuleStatusFilterFromTestado();
} }
$sql_model = "SELECT %s FROM $sql_model = "SELECT %s FROM