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

Fix issue relation loosing extra options on ctb update Fixes #3409 (#10102)

Browse Source
This commit is contained in:
Alexandre BODIN 2021-04-27 03:05:43 +12:00 committed by GitHub
parent 11a128ead2
commit 196b0895f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/strapi-plugin-content-type-builder/services/schema-builder/content-type-builder.js
View File

@ -158,7 +158,8 @@ module.exports = function createComponentBuilder() {
this.unsetRelation(oldAttribute); this.unsetRelation(oldAttribute);
} }
newAttribute.autoPopulate = newAttribute.autoPopulate || oldAttribute.autoPopulate; // keep extra options that were set manually on oldAttribute
_.defaults(newAttribute, oldAttribute);
return this.setRelation({ return this.setRelation({
key, key,

4
packages/strapi-plugin-content-type-builder/services/schema-builder/index.js
View File

@ -115,8 +115,8 @@ function createSchemaBuilder({ components, contentTypes }) {
targetAttribute, targetAttribute,
columnName, columnName,
dominant, dominant,
autoPopulate,
private: isPrivate, private: isPrivate,
...restOfOptions
} = attribute; } = attribute;
const attr = { const attr = {
@ -124,7 +124,7 @@ function createSchemaBuilder({ components, contentTypes }) {
columnName: columnName || undefined, columnName: columnName || undefined,
configurable: configurable === false ? false : undefined, configurable: configurable === false ? false : undefined,
private: isPrivate === true ? true : undefined, private: isPrivate === true ? true : undefined,
autoPopulate, ...restOfOptions,
}; };
if (!this.contentTypes.has(target)) { if (!this.contentTypes.has(target)) {