tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed filter by name module in tree view, Node and Meta. tiquet: 2056

This commit is contained in:
m-lopez-f 2015-03-31 14:46:43 +02:00
parent e90406abaf
commit a756ef1ab5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,7 +367,8 @@ class Tree {
AND ta.id_grupo = tg.id_grupo AND ta.id_grupo = tg.id_grupo
$group_acl $group_acl
$agent_search_filter $agent_search_filter
$agent_status_filter"; $agent_status_filter
$module_search_filter";
$counter_columns = $this->getAgentCounterColumnsSql($agent_table); $counter_columns = $this->getAgentCounterColumnsSql($agent_table);
if (!empty($counter_columns)) if (!empty($counter_columns))
$columns .= ", $counter_columns"; $columns .= ", $counter_columns";
@ -385,6 +386,7 @@ class Tree {
$group_acl $group_acl
$agent_search_filter $agent_search_filter
$agent_status_filter $agent_status_filter
$module_search_filter
GROUP BY tg.id_grupo GROUP BY tg.id_grupo
ORDER BY $order_fields"; ORDER BY $order_fields";
} }
@ -407,6 +409,7 @@ class Tree {
$group_acl $group_acl
$agent_search_filter $agent_search_filter
$agent_status_filter $agent_status_filter
$module_search_filter
GROUP BY ta.id_agente GROUP BY ta.id_agente
ORDER BY $order_fields"; ORDER BY $order_fields";
} }