yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 01:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7212 from strapi/fix/issue-7196

Browse Source 
Fix admin routes and user controllers conflicting
This commit is contained in:
Alexandre BODIN 2020-07-27 19:47:22 +02:00 committed by GitHub
commit c4472f620b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi/lib/middlewares/router/index.js
View File

@ -33,7 +33,7 @@ module.exports = strapi => {
}); });
_.get(strapi.admin, 'config.routes', []).forEach(route => { _.get(strapi.admin, 'config.routes', []).forEach(route => {
composeEndpoint(route, { router }); composeEndpoint(route, { plugin: 'admin', router });
}); });
// Mount admin router on Strapi router // Mount admin router on Strapi router

7
packages/strapi/lib/middlewares/router/utils/routerChecker.js
View File

@ -25,9 +25,12 @@ module.exports = strapi =>
let controller; let controller;
if (plugin) { if (plugin) {
controller = strapi.plugins[plugin].controllers[controllerKey]; controller =
plugin === 'admin'
? strapi.admin.controllers[controllerKey]
: strapi.plugins[plugin].controllers[controllerKey];
} else { } else {
controller = strapi.controllers[controllerKey] || strapi.admin.controllers[controllerKey]; controller = strapi.controllers[controllerKey];
} }
if (!_.isFunction(controller[actionName])) { if (!_.isFunction(controller[actionName])) {