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

fixed minor error tree view acl

This commit is contained in:
daniel 2018-09-10 12:08:38 +02:00
parent 3d3670f6f9
commit 729fe74758
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ class Tree {
: " AND $filter "; : " AND $filter ";
} }
static function getGroupAclCondition() { public function getGroupAclCondition() {
if (users_can_manage_group_all("AR")) return ""; if (users_can_manage_group_all("AR")) return "";
$groups_str= implode(",", $this->userGroupsArray); $groups_str= implode(",", $this->userGroupsArray);

6
pandora_console/include/functions_groupview.php
View File

@ -87,9 +87,9 @@ function groupview_get_modules_counters($groups_ids = false) {
return db_get_all_rows_sql($sql); return db_get_all_rows_sql($sql);
} }
function groupview_get_all_counters() { function groupview_get_all_counters($tree_group) {
$all_name = __("All"); $all_name = __("All");
$group_acl = Tree::getGroupAclCondition(); $group_acl = $tree_group->getGroupAclCondition();
$table = is_metaconsole() ? 'tmetaconsole_agent' : 'tagente'; $table = is_metaconsole() ? 'tmetaconsole_agent' : 'tagente';
$table_sec = is_metaconsole() $table_sec = is_metaconsole()
? 'tmetaconsole_agent_secondary_group' ? 'tmetaconsole_agent_secondary_group'
@ -180,7 +180,7 @@ function groupview_get_groups_list($id_user = false, $access = 'AR', $is_not_pag
$list[$id_group]['_monitors_alerts_fired_'] = (int)$modules_counters[$id_group]['total_module_alerts']; $list[$id_group]['_monitors_alerts_fired_'] = (int)$modules_counters[$id_group]['total_module_alerts'];
} }
array_unshift($list, groupview_get_all_counters()); array_unshift($list, groupview_get_all_counters($tree_group));
return array( return array(
'groups' => $list, 'groups' => $list,
'counter' => $counter 'counter' => $counter