diff options
| author | Christian Hofmaier | 2017-03-28 12:08:25 +0200 |
|---|---|---|
| committer | Christian Hofmaier | 2017-03-28 12:08:25 +0200 |
| commit | 03cf4b577d0a0def663ad9f078e005ea391caef5 (patch) | |
| tree | 5ac97349eec58a9efe5dff17ef83bdd232f14da3 /modules-available/permissionmanager/inc | |
| parent | [permission-manager] made function private. (diff) | |
| download | slx-admin-03cf4b577d0a0def663ad9f078e005ea391caef5.tar.gz slx-admin-03cf4b577d0a0def663ad9f078e005ea391caef5.tar.xz slx-admin-03cf4b577d0a0def663ad9f078e005ea391caef5.zip | |
[permission-manager] role-list order consistency
Diffstat (limited to 'modules-available/permissionmanager/inc')
| -rw-r--r-- | modules-available/permissionmanager/inc/getdata.inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/permissionmanager/inc/getdata.inc.php b/modules-available/permissionmanager/inc/getdata.inc.php index 7eac333f..481ac398 100644 --- a/modules-available/permissionmanager/inc/getdata.inc.php +++ b/modules-available/permissionmanager/inc/getdata.inc.php @@ -18,7 +18,7 @@ class GetData { // get all roles from database (id and name) public static function getRoles() { - $res = Database::simpleQuery("SELECT id, name FROM role ORDER BY name"); + $res = Database::simpleQuery("SELECT id, name FROM role ORDER BY name ASC"); $data = array(); while ($row = $res->fetch(PDO::FETCH_ASSOC)) { $data[] = array( @@ -31,7 +31,7 @@ class GetData { // UserID, User Login Name, Roles of each User private static function queryUserData() { - $res = Database::simpleQuery("SELECT user.userid AS userid, user.login AS login, GROUP_CONCAT(role.name) AS role + $res = Database::simpleQuery("SELECT user.userid AS userid, user.login AS login, GROUP_CONCAT(role.name ORDER BY role.name ASC) AS role FROM user LEFT JOIN userXrole ON user.userid = userXrole.userid LEFT JOIN role ON userXrole.roleid = role.id |