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