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

Merge branch '1867-Errores_en_vista_de_eventos_con_usuario_con_tags' into 'develop' 

fixed error show events

See merge request artica/pandorafms!1287
This commit is contained in:
vgilc 2018-02-12 08:52:04 +01:00
parent be4509cbf1 74a8212032
commit 8c7c3b2c09
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions.php
View File

@ -1810,7 +1810,7 @@ function check_acl($id_user, $id_group, $access, $onlyOneGroup = false) {
}
if ($id_group != 0 || $onlyOneGroup === true) {
$groups_list_acl = users_get_groups ($id_user, 'AR', false, true, null);
$groups_list_acl = users_get_groups ($id_user, $access, false, true, null);
}
else{
$groups_list_acl = get_users_acl($id_user);

8
pandora_console/include/functions_tags.php
View File

@ -1432,8 +1432,12 @@ function tags_checks_event_acl($id_user, $id_group, $access, $tags = array(), $c
AND id_perfil IN (
SELECT id_perfil
FROM tperfil
WHERE ".get_acl_column($access)." = 1)
AND id_grupo = ".$id_group;
WHERE ".get_acl_column($access)." = 1)";
if(isset($id_group)){
$sql .= "AND id_grupo = ".$id_group;
}
$user_has_perm_without_tags = db_get_all_rows_sql ($sql);
if ($user_has_perm_without_tags) {