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

Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop

This commit is contained in:
marcos.alconada 2019-06-13 15:18:17 +02:00
parent 91ccee06ab beea6941e5
commit 19b68ab784
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/rest-api/models/VisualConsole/Container.php
View File

@ -319,7 +319,7 @@ final class Container extends Model
// Default filter.
$filter = ['id_layout' => $layoutId];
$fields = [
'id',
'DISTINCT(id) AS id',
'type',
'cache_expiration',
'id_layout',
@ -340,6 +340,7 @@ final class Container extends Model
// Only true condition if type is GROUP_ITEM.
$filter[] = '('.\db_format_array_where_clause_sql(
[
'id_layout' => $layoutId,
'type' => GROUP_ITEM,
'id_group' => $groupsFilter,
]

4
pandora_console/operation/menu.php
View File

@ -66,7 +66,7 @@ if (check_acl($config['id_user'], 0, 'AR')) {
enterprise_hook('inventory_menu');
if ($config['activate_netflow'] || $config['activate_nta']) {
$sub['network'] = [
$sub['network_traffic'] = [
'text' => __('Network'),
'id' => 'Network',
'type' => 'direct',
@ -117,7 +117,7 @@ if (check_acl($config['id_user'], 0, 'AR')) {
);
}
$sub['network']['sub2'] = $netflow_sub;
$sub['network_traffic']['sub2'] = $netflow_sub;
}
if ($config['log_collector'] == 1) {