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-6361-10708-bug-en-visualizacion-de-eventos-con-standar-user' into 'develop' 

fixes

See merge request artica/pandorafms!3468
This commit is contained in:
Daniel Rodriguez 2020-09-23 09:42:20 +02:00
parent dadba4f81d 724de97818
commit d8daf9f063
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_events.php
View File

@ -929,9 +929,9 @@ function events_get_all(
} }
if (!$user_is_admin) { if (!$user_is_admin) {
$ER_groups = users_get_groups($config['id_user'], 'ER', false); $ER_groups = users_get_groups($config['id_user'], 'ER', true);
$EM_groups = users_get_groups($config['id_user'], 'EM', false, true); $EM_groups = users_get_groups($config['id_user'], 'EM', true, true);
$EW_groups = users_get_groups($config['id_user'], 'EW', false, true); $EW_groups = users_get_groups($config['id_user'], 'EW', true, true);
} }
if (!$user_is_admin && !users_can_manage_group_all('ER')) { if (!$user_is_admin && !users_can_manage_group_all('ER')) {

9
pandora_console/operation/events/events.php
View File

@ -470,8 +470,13 @@ $tags_select_with = [];
$tags_select_without = []; $tags_select_without = [];
$tag_with_temp = []; $tag_with_temp = [];
$tag_without_temp = []; $tag_without_temp = [];
$tag_with = json_decode(base64_decode($tag_with), true); if (is_array($tag_with) === false) {
$tag_without = json_decode(base64_decode($tag_without), true); $tag_with = json_decode(base64_decode($tag_with), true);
}
if (is_array($tag_without) === false) {
$tag_without = json_decode(base64_decode($tag_without), true);
}
foreach ($tags as $id_tag => $tag) { foreach ($tags as $id_tag => $tag) {