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

Merge branch '1596-4876-Dropdown-menus-por-orden-de-ID' into 'develop' 

Order by name group select in manage agent view - 

See merge request
This commit is contained in:
vgilc 2017-12-21 09:06:21 +01:00
parent 349a9bbd35 2a13f5fbf6
commit e89363582a
1 changed files with 2 additions and 2 deletions
pandora_console/include
functions_users.php

4
pandora_console/include/functions_users.php
View File

@ -169,14 +169,14 @@ function users_get_groups ($id_user = false, $privilege = "AR", $returnAllGroup
} else {
// Admin.
if (is_user_admin($id_user)) {
$groups = db_get_all_rows_sql ("SELECT * FROM tgrupo");
$groups = db_get_all_rows_sql ("SELECT * FROM tgrupo ORDER BY nombre");
}
// Per-group permissions.
else {
$query = sprintf("SELECT tgrupo.*, tperfil.*, tusuario_perfil.tags FROM tgrupo, tusuario_perfil, tperfil
WHERE (tgrupo.id_grupo = tusuario_perfil.id_grupo OR tusuario_perfil.id_grupo = 0)
AND tusuario_perfil.id_perfil = tperfil.id_perfil
AND tusuario_perfil.id_usuario = '%s'", $id_user);
AND tusuario_perfil.id_usuario = '%s' ORDER BY nombre", $id_user);
$groups = db_get_all_rows_sql ($query);
// Get children groups.