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

Waiting knex fired event before load bookshelf

Browse Source
This commit is contained in:
Aurélien Georget 2016-07-05 14:32:50 +02:00
parent 3734bb2f59
commit 1b7e1b9e6a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/strapi-bookshelf/lib/index.js
View File

@ -37,16 +37,16 @@ module.exports = function (strapi) {
initialize: function (cb) {
let globalName;
// Make sure the Knex hook is present since Knex needs it.
if (!strapi.hooks.knex) {
strapi.log.error('Impossible to load the ORM without the query builder!');
strapi.log.error('You need to install the Strapi query builder with `$ npm install strapi-knex --save`.');
strapi.stop(1);
}
// Only run this logic after the Knex has finished to load.
strapi.after('hook:knex:loaded', function () {
// Make sure the Knex hook is present since Knex needs it.
if (!strapi.hooks.external.knex) {
strapi.log.error('Impossible to load the ORM without the query builder!');
strapi.log.error('You need to install the Strapi query builder with `$ npm install strapi-knex --save`.');
strapi.stop(1);
}
// Initialize collections
_.set(strapi, 'bookshelf.collections', {});

1
packages/strapi/lib/configuration/hooks/dictionary/_hooks/index.js
View File

@ -63,6 +63,7 @@ module.exports = function (strapi) {
cb(err);
}
}
return memo;
}, {}));