yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 11:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2911 from strapi/fix/users-count-role-sql

Browse Source 
Fix user count per role on SQL database
This commit is contained in:
Jim LAURIE 2019-03-02 13:49:01 +01:00 committed by GitHub
commit 0d731bf8cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/strapi-plugin-users-permissions/config/queries/mongoose.js
View File

@ -11,9 +11,10 @@ module.exports = {
.lean(); .lean();
}, },
count: async function (params = {}) { count: async function (params = {where: {}}) {
return Number(await this return Number(await this
.countDocuments(params)); .countDocuments()
.where(params.where));
}, },
findOne: async function (params, populate) { findOne: async function (params, populate) {

3
packages/strapi-plugin-users-permissions/services/UsersPermissions.js
View File

@ -182,7 +182,8 @@ module.exports = {
for (let i = 0; i < roles.length; ++i) { for (let i = 0; i < roles.length; ++i) {
roles[i].id = roles[i].id || roles[i]._id; roles[i].id = roles[i].id || roles[i]._id;
roles[i].nb_users = await strapi.query('user', 'users-permissions').count({ role: roles[i].id });
roles[i].nb_users = await strapi.query('user', 'users-permissions').count(strapi.utils.models.convertParams('user', { role: roles[i].id }));
} }
return roles; return roles;