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

Rename getRoles, getRole to find, findOne

Browse Source
This commit is contained in:
harimkims 2022-03-03 22:55:29 +09:00
parent 4a71a9c93c
commit 567816591a
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/plugins/users-permissions/server/controllers/role.js
View File

@ -21,10 +21,10 @@ module.exports = {
ctx.send({ ok: true });
},
async getRole(ctx) {
async findOne(ctx) {
const { id } = ctx.params;
const role = await getService('role').getRole(id);
const role = await getService('role').findOne(id);
if (!role) {
return ctx.notFound();
@ -33,8 +33,8 @@ module.exports = {
ctx.send({ role });
},
async getRoles(ctx) {
const roles = await getService('role').getRoles();
async find(ctx) {
const roles = await getService('role').find();
ctx.send({ roles });
},

2
packages/plugins/users-permissions/server/controllers/settings.js
View File

@ -37,7 +37,7 @@ module.exports = {
.store({ type: 'plugin', name: 'users-permissions', key: 'advanced' })
.get();
const roles = await getService('role').getRoles();
const roles = await getService('role').find();
ctx.send({ settings, roles });
},

4
packages/plugins/users-permissions/server/routes/admin/role.js
View File

@ -4,7 +4,7 @@ module.exports = [
{
method: 'GET',
path: '/roles/:id',
handler: 'role.getRole',
handler: 'role.findOne',
config: {
policies: [
{
@ -19,7 +19,7 @@ module.exports = [
{
method: 'GET',
path: '/roles',
handler: 'role.getRoles',
handler: 'role.find',
config: {
policies: [
{

4
packages/plugins/users-permissions/server/routes/content-api/role.js
View File

@ -4,12 +4,12 @@ module.exports = [
{
method: 'GET',
path: '/roles/:id',
handler: 'role.getRole',
handler: 'role.findOne',
},
{
method: 'GET',
path: '/roles',
handler: 'role.getRoles',
handler: 'role.find',
},
{
method: 'POST',

4
packages/plugins/users-permissions/server/services/role.js
View File

@ -41,7 +41,7 @@ module.exports = ({ strapi }) => ({
await Promise.all(createPromises);
},
async getRole(roleID) {
async findOne(roleID) {
const role = await strapi
.query('plugin::users-permissions.role')
.findOne({ where: { id: roleID }, populate: ['permissions'] });
@ -68,7 +68,7 @@ module.exports = ({ strapi }) => ({
};
},
async getRoles() {
async find() {
const roles = await strapi.query('plugin::users-permissions.role').findMany({ sort: ['name'] });
for (const role of roles) {