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-7547-Tree-view-no-filtra-bien-Dashboard' into 'develop' 

Ent 7547 tree view no filtra bien dashboard

See merge request artica/pandorafms!4136
This commit is contained in:
Daniel Rodriguez 2021-06-21 14:01:32 +00:00
parent 19579c0801 878a5321e8
commit f134377b37
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1126,6 +1126,7 @@ class Tree
$agent_search_filter $agent_search_filter
$agent_status_filter $agent_status_filter
$module_search_filter $module_search_filter
$module_status_filter
$tag_condition $tag_condition
GROUP BY tam.id_agente_modulo GROUP BY tam.id_agente_modulo
ORDER BY tam.nombre ASC, tam.id_agente_modulo ASC"; ORDER BY tam.nombre ASC, tam.id_agente_modulo ASC";

44
pandora_console/include/lib/Dashboard/Widgets/tree_view.php
View File

@ -418,28 +418,30 @@ class TreeViewWidget extends Widget
AGENT_MODULE_STATUS_NOT_INIT => __('Not init'), AGENT_MODULE_STATUS_NOT_INIT => __('Not init'),
]; ];
$inputs[] = [ if (is_metaconsole() === false) {
'label' => __('Modules status'), $inputs[] = [
'arguments' => [ 'label' => __('Modules status'),
'type' => 'select', 'arguments' => [
'fields' => $fields, 'type' => 'select',
'name' => 'moduleStatus', 'fields' => $fields,
'selected' => $values['moduleStatus'], 'name' => 'moduleStatus',
'return' => true, 'selected' => $values['moduleStatus'],
], 'return' => true,
]; ],
];
// Filter modules. // Filter modules.
$inputs[] = [ $inputs[] = [
'label' => __('Filter modules'), 'label' => __('Filter modules'),
'arguments' => [ 'arguments' => [
'name' => 'filterModule', 'name' => 'filterModule',
'type' => 'text', 'type' => 'text',
'value' => $values['filterModule'], 'value' => $values['filterModule'],
'return' => true, 'return' => true,
'size' => 0, 'size' => 0,
], ],
]; ];
}
return $inputs; return $inputs;
} }