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-4294-7984-Desplegable-de-grupos-desordenados' into 'develop' 

Fixed unordered groups

See merge request artica/pandorafms!2559
This commit is contained in:
Alejandro Fraguas 2019-07-02 16:06:33 +02:00
parent 3a76f331c8 63e0df4434
commit 86610ebe96
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -163,7 +163,7 @@ echo '<td>';
echo __('Group').'&nbsp;';
$own_info = get_user_info($config['id_user']);
if (!$own_info['is_admin'] && check_acl($config['id_user'], 0, 'AW')) {
if (!$own_info['is_admin'] && !check_acl($config['id_user'], 0, 'AR') && !check_acl($config['id_user'], 0, 'AW')) {
$return_all_group = false;
} else {
$return_all_group = true;

2
pandora_console/include/functions_users.php
View File

@ -293,7 +293,7 @@ function users_get_groups(
}
// Per-group permissions.
else {
$query = 'SELECT * FROM tgrupo ORDER BY parent,id_grupo DESC';
$query = 'SELECT * FROM tgrupo ORDER BY nombre';
$raw_groups = db_get_all_rows_sql($query);
$query = sprintf(