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

Merge branch '3229-Error-SQL-en-vista-de-Agente-dev' into 'develop' 

Fixed sql error with secondary groups in agent view

See merge request artica/pandorafms!2050

Former-commit-id: 3a3a979c6e45ec7ee9fed078fa458198ef021708
This commit is contained in:
vgilc 2018-12-07 11:46:31 +01:00
parent b901e1db0f 05a06146ef
commit 66f3886193
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'; $filter = '1 = 1';
} }
$secondary_join = ''; $secondary_join = "LEFT JOIN tagent_secondary_group tasg ON tevento.id_agente = tasg.id_agent";
if (!users_can_manage_group_all("ER")) {
$secondary_join = "LEFT JOIN tagent_secondary_group tasg ON tevento.id_agente = tasg.id_agent";
}
$sql = sprintf ("SELECT DISTINCT tevento.* $sql = sprintf ("SELECT DISTINCT tevento.*
FROM tevento %s 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) { function tags_get_acl_tags_event_condition($acltags, $meta = false, $force_group_and_tag = false, $force_equal = false) {
global $config; global $config;
$condition = ''; $condition = array();
// Get all tags of the system // Get all tags of the system
$all_tags = tags_get_all_tags(false); $all_tags = tags_get_all_tags(false);