diff options
| author | Peter Zhang <peter@innocraft.com> | 2022-08-31 10:03:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-31 10:03:40 +0300 |
| commit | 598c7e5af8b196df1ef0dc78c196a4e0968b26aa (patch) | |
| tree | 306bdf37d4665280a69b08645b468cf115a8df0a /plugins/UsersManager/Model.php | |
| parent | 645c4eb518a3668060e02d04750efb5d7ff50b2a (diff) | |
filtering a user's permissions, capabilities fixes (#19680)
* update some get role and capabilities
update some get role and capabilities
* update query and add tests
update query and add tests
* update query
update query
* Update Model.php
update access
* add UI tests
add UI tests
* Update UsersManager_spec.js
update
* Update UsersManager_admin_view_admin_filter_permissions.png
update ui
Diffstat (limited to 'plugins/UsersManager/Model.php')
| -rw-r--r-- | plugins/UsersManager/Model.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/UsersManager/Model.php b/plugins/UsersManager/Model.php index 873dbb12fa..787b07b3aa 100644 --- a/plugins/UsersManager/Model.php +++ b/plugins/UsersManager/Model.php @@ -202,7 +202,13 @@ class Model } } - $sql = 'SELECT SQL_CALC_FOUND_ROWS s.idsite as idsite, s.name as site_name, GROUP_CONCAT(a.access SEPARATOR "|") as access + $selector = "a.access"; + if ($access) { + $selector = 'b.access'; + $joins .= " LEFT JOIN ". Common::prefixTable('access') ." b on a.idsite = b.idsite AND a.login = b.login"; + } + + $sql = 'SELECT SQL_CALC_FOUND_ROWS s.idsite as idsite, s.name as site_name, GROUP_CONCAT('.$selector.' SEPARATOR "|") as access FROM ' . Common::prefixTable('access') . " a $joins $where |