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

Merge branch 'ent-6666-error-extensino-mainframe' into 'develop' 

fixed sql error with secundary groups ZOS

See merge request artica/pandorafms!3607
This commit is contained in:
Daniel Rodriguez 2021-01-14 14:49:26 +01:00
parent 8cd742c90c 915c039fcd
commit 1a99dfa517
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_tags.php
View File

@ -900,7 +900,11 @@ function tags_get_acl_tags_module_condition($acltags, $modules_table='', $force_
}
$in_group = implode(',', $without_tags);
$condition .= sprintf('(tagente.id_grupo IN (%s) OR tasg.id_group IN (%s))', $in_group, $in_group);
if ($has_secondary) {
$condition .= sprintf('(tagente.id_grupo IN (%s) OR tasg.id_group IN (%s))', $in_group, $in_group);
} else {
$condition .= sprintf('(tagente.id_grupo IN (%s))', $in_group);
}
}
$condition = !empty($condition) ? "($condition)" : '';