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

Fix API name issue

Browse Source
This commit is contained in:
pierreburgy 2015-10-06 12:42:12 +02:00
parent dc1d59e3a4
commit 3a8bf27ea8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/configuration/hooks/_api/index.js
View File

@ -30,6 +30,11 @@ module.exports = function (strapi) {
_.forEach(strapi.api, function (definition, api) {
async.auto({
// Expose the `name` of the API for the callback.
'name': function (cb) {
cb(null, api)
},
// Load API controllers from `./api/*/controllers/*.js`.
'controllers/*': function (cb) {
dictionary.optional({
@ -111,7 +116,7 @@ module.exports = function (strapi) {
}
// Expose the API dictionary.
strapi.api[api] = {
strapi.api[api.name] = {
controllers: api['controllers/*'],
models: api['models/*'],
services: api['services/*'],
@ -123,16 +128,16 @@ module.exports = function (strapi) {
};
// Merge API controllers with the main ones.
strapi.controllers = _.merge(strapi.controllers, strapi.api[api].controllers);
strapi.controllers = _.merge(strapi.controllers, strapi.api[api.name].controllers);
// Merge API models with the main ones.
strapi.models = _.merge(strapi.models, strapi.api[api].models);
strapi.models = _.merge(strapi.models, strapi.api[api.name].models);
// Merge API policies with the main ones.
strapi.policies = _.merge(strapi.policies, strapi.api[api].policies);
strapi.policies = _.merge(strapi.policies, strapi.api[api.name].policies);
// Merge API routes with the main ones.
strapi.config.routes = _.merge(strapi.config.routes, strapi.api[api].config.routes);
strapi.config.routes = _.merge(strapi.config.routes, strapi.api[api.name].config.routes);
});
});