yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-24 21:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get role with users

Browse Source
This commit is contained in:
Jim Laurie 2017-11-30 16:52:28 +01:00
parent 75ca6fa713
commit 7dc3dd9cde
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-plugin-users-permissions/controllers/UsersPermissions.js
View File

@ -76,7 +76,7 @@ module.exports = {
getRole: async (ctx) => {
const { id } = ctx.params;
const role = await strapi.plugins['users-permissions'].services.userspermissions.getRole(id)[id];
const role = await strapi.plugins['users-permissions'].services.userspermissions.getRole(id);
if (_.isEmpty(role)) {
return ctx.badRequest(null, [{ messages: [{ id: `Role don't exist` }] }]);

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

@ -71,11 +71,12 @@ module.exports = {
return allPermissions;
},
getRole: (roleId) => {
getRole: async (roleId) => {
const Service = strapi.plugins['users-permissions'].services.userspermissions;
const appRoles = require(Service.getRoleConfigPath());
appRoles[roleId].users = await strapi.query('user', 'users-permissions').find(strapi.utils.models.convertParams('user', { role: roleId }));
return _.pick(appRoles, [roleId]);
return appRoles[roleId];
},
getRoles: async () => {
@ -86,7 +87,7 @@ module.exports = {
const role = _.pick(roles[key], ['name', 'description']);
_.set(role, 'id', key);
_.set(role, 'nb_users', _.get(_.find(usersCount, { _id: parseFloat(key) }), 'total'));
_.set(role, 'nb_users', _.get(_.find(usersCount, { _id: parseFloat(key) }), 'total', 0));
acc.push(role);
return acc;