Merge branch 'alpha.4' of github.com:strapi/strapi into alpha.4

This commit is contained in:
Aurélien Georget 2017-02-14 14:37:04 +01:00
commit dff292593e
2 changed files with 2 additions and 2 deletions

View File

@ -38,7 +38,7 @@ module.exports = {
*/
add: (values) => {
return <%= humanizeSubId || humanizeId %>.create(values);
return <%= globalID %>.create(values);
},
/**

View File

@ -41,7 +41,7 @@ module.exports = function (strapi) {
let globalName;
// Return callback if there is no model
if (_.isEmpty(strapi.models) || _.pickBy(strapi.config.connections, {connector: 'strapi-mongoose'})) {
if (_.isEmpty(strapi.models) || !_.pickBy(strapi.config.connections, {connector: 'strapi-mongoose'})) {
return cb();
}