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

Filter clusters by groups - #1868

This commit is contained in:
enriquecd 2018-02-28 14:32:35 +01:00
parent 99d5da9dd3
commit 8fce51a816
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/ajax/module.php
View File

@ -471,6 +471,7 @@ if ($list_modules) {
$id_agente = $id_agent = (int)get_parameter('id_agente', 0);
$show_notinit = (int)get_parameter('show_notinit', 0);
$cluster_list = (int)get_parameter('cluster_list', 0);
$url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $id_agent;
$selectTypeUp = '';
$selectTypeDown = '';
@ -562,9 +563,11 @@ if ($list_modules) {
// Fix: for tag functionality groups have to be all user_groups (propagate ACL funct!)
$groups = users_get_groups($config["id_user"], $access);
$tags_sql = tags_get_acl_tags($config['id_user'],
array_keys($groups), $access, 'module_condition', 'AND',
'tagente_modulo', false, array(), true);
if($cluster_list != 1){
$tags_sql = tags_get_acl_tags($config['id_user'],
array_keys($groups), $access, 'module_condition', 'AND',
'tagente_modulo', false, array(), true);
}
$status_filter_monitor = (int)get_parameter('status_filter_monitor', -1);
$status_text_monitor = get_parameter('status_text_monitor', '');

2
pandora_console/include/functions_agents.php
View File

@ -80,7 +80,7 @@ function agents_create_agent ($name, $id_group, $interval, $ip_address, $values
if (empty ($name))
return false;
if (empty ($id_group))
if (empty ($id_group) && (int)$id_group != 0)
return false;
if (empty ($ip_address))