yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 08:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix delete info.mainFied in content type builder fix #1301

Browse Source
This commit is contained in:
Jim Laurie 2018-06-12 22:48:31 +02:00
parent 07f2c3aea5
commit d240e2ac82
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/strapi-plugin-content-type-builder/controllers/ContentTypeBuilder.js
View File

@ -86,7 +86,7 @@ module.exports = {
updateModel: async ctx => { updateModel: async ctx => {
const { model } = ctx.params; const { model } = ctx.params;
const { name, description, connection, collectionName, attributes = [], plugin } = ctx.request.body; const { name, description, mainField, connection, collectionName, attributes = [], plugin } = ctx.request.body;
if (!name) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.name.missing' }] }]); if (!name) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.name.missing' }] }]);
if (!_.includes(Service.getConnections(), connection)) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.connection.unknow' }] }]); if (!_.includes(Service.getConnections(), connection)) return ctx.badRequest(null, [{ messages: [{ id: 'request.error.connection.unknow' }] }]);
@ -122,6 +122,10 @@ module.exports = {
}; };
modelJSON.attributes = formatedAttributes; modelJSON.attributes = formatedAttributes;
if (mainField) {
modelJSON.info.mainField = mainField;
}
const clearRelationsErrors = Service.clearRelations(model, plugin); const clearRelationsErrors = Service.clearRelations(model, plugin);
if (!_.isEmpty(clearRelationsErrors)) { if (!_.isEmpty(clearRelationsErrors)) {

1
packages/strapi-plugin-content-type-builder/services/ContentTypeBuilder.js
View File

@ -105,6 +105,7 @@ module.exports = {
return { return {
name: _.get(model, 'info.name', 'model.name.missing'), name: _.get(model, 'info.name', 'model.name.missing'),
description: _.get(model, 'info.description', 'model.description.missing'), description: _.get(model, 'info.description', 'model.description.missing'),
mainField: _.get(model, 'info.mainField', ''),
connection: model.connection, connection: model.connection,
collectionName: model.collectionName, collectionName: model.collectionName,
attributes: attributes attributes: attributes