diff options
| author | Simon Rettberg | 2018-04-13 12:30:43 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-04-13 12:30:43 +0200 |
| commit | 5014f09a5aa30b1c3aa1e35e67a183086a212052 (patch) | |
| tree | c06f085e76de9a7a33fa16ae3252e38fa8b31863 /modules-available/permissionmanager/inc/getpermissiondata.inc.php | |
| parent | [permissionmanager] Preselect all locations when adding new role (diff) | |
| download | slx-admin-5014f09a5aa30b1c3aa1e35e67a183086a212052.tar.gz slx-admin-5014f09a5aa30b1c3aa1e35e67a183086a212052.tar.xz slx-admin-5014f09a5aa30b1c3aa1e35e67a183086a212052.zip | |
[permissionmanager] Add role description field; install some default rules
Closes #3356
Diffstat (limited to 'modules-available/permissionmanager/inc/getpermissiondata.inc.php')
| -rw-r--r-- | modules-available/permissionmanager/inc/getpermissiondata.inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/permissionmanager/inc/getpermissiondata.inc.php b/modules-available/permissionmanager/inc/getpermissiondata.inc.php index fc18de99..660c94ae 100644 --- a/modules-available/permissionmanager/inc/getpermissiondata.inc.php +++ b/modules-available/permissionmanager/inc/getpermissiondata.inc.php @@ -84,7 +84,7 @@ class GetPermissionData if (!empty($joins)) { $joins .= ' GROUP BY r.roleid'; } - return Database::queryAll("SELECT r.roleid, r.rolename $cols FROM role r + return Database::queryAll("SELECT r.roleid, r.rolename, r.roledescription $cols FROM role r $joins ORDER BY rolename ASC"); } @@ -97,7 +97,7 @@ class GetPermissionData */ public static function getRoleData($roleid) { - $query = "SELECT roleid, rolename FROM role WHERE roleid = :roleid"; + $query = "SELECT roleid, rolename, roledescription FROM role WHERE roleid = :roleid"; $data = Database::queryFirst($query, array("roleid" => $roleid)); $query = "SELECT roleid, locationid FROM role_x_location WHERE roleid = :roleid"; $res = Database::simpleQuery($query, array("roleid" => $roleid)); |