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

use the new method to generate the collection name

Browse Source
This commit is contained in:
Kamal Bennani 2018-09-14 00:24:07 +02:00
parent 3593046c41
commit e5ce8c1b42
No known key found for this signature in database
GPG Key ID: 4513063CDB1A1C25
1 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
packages/strapi-hook-bookshelf/lib/index.js
View File

@ -502,7 +502,7 @@ module.exports = function(strapi) {
console.log(e);
}
strapi.log.warn(`The SQL database indexes haven't been generated successfully. Please enable the debug mode for more details.`);
strapi.log.warn('The SQL database indexes haven\'t been generated successfully. Please enable the debug mode for more details.');
}
}
};
@ -677,24 +677,11 @@ module.exports = function(strapi) {
}
};
const table = _.get(manyRelations, 'collectionName') ||
_.map(
_.sortBy(
[
collection.attributes[
manyRelations.via
],
const table = _.get(manyRelations, 'collectionName')
|| utilsModels.getCollectionName(
collection.attributes[manyRelations.via],
manyRelations
],
'collection'
),
table => {
return _.snakeCase(
// eslint-disable-next-line prefer-template
pluralize.plural(table.collection) + ' ' + pluralize.plural(table.via)
);
}
).join('__');
await handler(table, attributes);
}
@ -813,24 +800,11 @@ module.exports = function(strapi) {
strapi.plugins[details.plugin].models[details.collection]:
strapi.models[details.collection];
const collectionName = _.get(details, 'collectionName') ||
_.map(
_.sortBy(
[
collection.attributes[
details.via
],
details
],
'collection'
),
table => {
return _.snakeCase(
// eslint-disable-next-line prefer-template
pluralize.plural(table.collection) + ' ' + pluralize.plural(table.via)
const collectionName = _.get(details, 'collectionName')
|| utilsModels.getCollectionName(
collection.attributes[details.via],
details,
);
}
).join('__');
const relationship = _.clone(
collection.attributes[details.via]