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

Fixed sql error with secondary groups in agent view 

Former-commit-id: 45ddc8329c0ca417c8499cf54d3526acd28eae0a
This commit is contained in:
danielmaya 2018-12-07 11:37:23 +01:00
parent e472612597
commit 05a06146ef
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/functions_events.php
View File

@ -853,10 +853,7 @@ function events_print_event_table ($filter = "", $limit = 10, $width = 440, $ret
$filter = '1 = 1';
}
$secondary_join = '';
if (!users_can_manage_group_all("ER")) {
$secondary_join = "LEFT JOIN tagent_secondary_group tasg ON tevento.id_agente = tasg.id_agent";
}
$secondary_join = "LEFT JOIN tagent_secondary_group tasg ON tevento.id_agente = tasg.id_agent";
$sql = sprintf ("SELECT DISTINCT tevento.*
FROM tevento %s

2
pandora_console/include/functions_tags.php
View File

@ -770,7 +770,7 @@ function tags_get_acl_tags_module_condition($acltags, $modules_table = '') {
function tags_get_acl_tags_event_condition($acltags, $meta = false, $force_group_and_tag = false, $force_equal = false) {
global $config;
$condition = '';
$condition = array();
// Get all tags of the system
$all_tags = tags_get_all_tags(false);