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-11518-carga-infinita-en-monitors-view-politicas' into 'develop' 

Ent 11518 carga infinita en monitors view politicas

See merge request artica/pandorafms!6067
This commit is contained in:
Diego Muñoz-Reja 2023-06-21 14:11:32 +00:00
parent 84be6e1d04 77909cb098
commit ce1ee4fac5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1056,6 +1056,7 @@ class Tree
$agent_search_filter = $this->getAgentSearchFilter(); $agent_search_filter = $this->getAgentSearchFilter();
$agent_status_filter = $this->getAgentStatusFilter(); $agent_status_filter = $this->getAgentStatusFilter();
$module_search_filter = $this->getModuleSearchFilter(); $module_search_filter = $this->getModuleSearchFilter();
$module_status_filter = $this->getModuleStatusFilter();
$module_status_inner = ''; $module_status_inner = '';
$module_search_inner = ''; $module_search_inner = '';
$module_search_filter = ''; $module_search_filter = '';
@ -1063,9 +1064,9 @@ class Tree
if (!empty($this->filter['searchModule'])) { if (!empty($this->filter['searchModule'])) {
$module_search_inner = ' $module_search_inner = '
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_inner.id_agente_modulo';
$module_search_filter = "AND tam.disabled = 0 $module_search_filter = "AND tam_inner.disabled = 0
AND tam.nombre LIKE '%%".$this->filter['searchModule']."%%' ".$this->getModuleStatusFilterFromTestado(); AND tam_inner.nombre LIKE '%%".$this->filter['searchModule']."%%' ".$this->getModuleStatusFilterFromTestado();
} }
$sql_model = "SELECT %s FROM $sql_model = "SELECT %s FROM