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-13473-widgets-block-histogram-y-module-histogram-no-se-visualizan-cuando-usamos-un-usuario-limitado' into 'develop' 

Ent 13473 widgets block histogram y module histogram no se visualizan cuando usamos un usuario limitado

See merge request artica/pandorafms!7171
This commit is contained in:
Jose Martin 2024-04-15 08:12:15 +00:00
parent e90d24f274 4b46f09256
commit cf39dbb872
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_events.php
View File

@ -1674,6 +1674,12 @@ function events_get_all(
} }
} }
if (!$user_is_admin && users_can_manage_group_all('ER') === false) {
if (str_contains($fields[0], 'te.id_grupo') === false) {
$fields[0] .= ', te.id_grupo';
}
}
if (((int) $filter['group_rep'] === EVENT_GROUP_REP_EVENTS if (((int) $filter['group_rep'] === EVENT_GROUP_REP_EVENTS
|| (int) $filter['group_rep'] === EVENT_GROUP_REP_EXTRAIDS) && $count === false || (int) $filter['group_rep'] === EVENT_GROUP_REP_EXTRAIDS) && $count === false
) { ) {

4
pandora_console/include/styles/dashboards.css
View File

@ -1000,3 +1000,7 @@ input.resize_button {
.grid-stack-item-content .visual-console-container-dashboard { .grid-stack-item-content .visual-console-container-dashboard {
text-align: initial; text-align: initial;
} }
ul.select2-selection__rendered > li.select2-selection__choice {
box-sizing: border-box !important;
}