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

Fix many-to-many relationships

Browse Source
This commit is contained in:
Aurelsicoko 2017-10-23 17:35:00 +02:00
parent 90e2993e0d
commit 1df5709085
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/strapi-plugin-content-manager/admin/src/components/EditFormRelations/index.js
View File

@ -34,19 +34,16 @@ class EditFormRelations extends React.Component { // eslint-disable-line react/p
break; break;
case 'oneToMany': case 'oneToMany':
case 'manyToMany': case 'manyToMany':
if (relation.dominant === true || relation.nature === 'manyToMany') { return (
return ( <SelectMany
<SelectMany currentModelName={this.props.currentModelName}
currentModelName={this.props.currentModelName} key={i}
key={i} record={this.props.record}
record={this.props.record} relation={relation}
relation={relation} schema={this.props.schema}
schema={this.props.schema} setRecordAttribute={this.props.setRecordAttribute}
setRecordAttribute={this.props.setRecordAttribute} />
/> );
);
}
break;
default: default:
break; break;
} }

2
packages/strapi-plugin-content-manager/config/queries/bookshelf.js
View File

@ -127,7 +127,7 @@ module.exports = {
// Push the work into the flow process. // Push the work into the flow process.
toAdd.forEach(value => { toAdd.forEach(value => {
value[details.via] = params.values[this.primaryKey]; value[details.via] = params.values[this.primaryKey] || params[this.primaryKey];
virtualFields.push(strapi.query(details.model || details.collection).addRelation({ virtualFields.push(strapi.query(details.model || details.collection).addRelation({
id: value[this.primaryKey] || value.id || value._id, id: value[this.primaryKey] || value.id || value._id,

6
packages/strapi-plugin-content-manager/config/queries/mongoose.js
View File

@ -120,8 +120,10 @@ module.exports = {
// Push the work into the flow process. // Push the work into the flow process.
toAdd.forEach(value => { toAdd.forEach(value => {
if (association.nature === 'manyToMany' && !_.isArray(params.values[this.primaryKey])) { if (association.nature === 'manyToMany' && !_.isArray(params.values[this.primaryKey] || params[this.primaryKey])) {
value[details.via] = (value[details.via] || []).concat([params.values[this.primaryKey]]); value[details.via] = (value[details.via] || []).concat([(params.values[this.primaryKey] || params[this.primaryKey])]).filter(x => {
return x !== null && x !== undefined;
});
} else { } else {
value[details.via] = params[this.primaryKey] || params.id; value[details.via] = params[this.primaryKey] || params.id;
} }