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

Remove primarykey from possible mainField with string type

Browse Source
This commit is contained in:
Alexandre Bodin 2019-11-21 11:49:29 +01:00
parent 6f82a4ea48
commit 7f90bdb5b9
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-plugin-content-manager/services/utils/configuration/index.js
View File

@ -24,6 +24,7 @@ async function createDefaultConfiguration(model) {
// convert model to schema // convert model to schema
const schema = formatContentTypeSchema(model); const schema = formatContentTypeSchema(model);
schema.primaryKey = model.primaryKey;
if (model.config) { if (model.config) {
await validateCustomConfig(model, schema); await validateCustomConfig(model, schema);
@ -40,6 +41,7 @@ async function createDefaultConfiguration(model) {
async function syncConfiguration(conf, model) { async function syncConfiguration(conf, model) {
// convert model to schema // convert model to schema
const schema = formatContentTypeSchema(model); const schema = formatContentTypeSchema(model);
schema.primaryKey = model.primaryKey;
if (model.config) { if (model.config) {
await validateCustomConfig(model, schema); await validateCustomConfig(model, schema);

13
packages/strapi-plugin-content-manager/services/utils/configuration/metadatas.js
View File

@ -29,11 +29,11 @@ function createDefaultMetadatas(schema) {
function createDefaultMainField(schema) { function createDefaultMainField(schema) {
if (!schema) return 'id'; if (!schema) return 'id';
return ( const mainField = Object.keys(schema.attributes).find(
Object.keys(schema.attributes).find( key => schema.attributes[key].type === 'string' && key !== schema.primaryKey
key => schema.attributes[key].type === 'string'
) || 'id'
); );
return mainField || 'id';
} }
function createDefaultMetadata(schema, name) { function createDefaultMetadata(schema, name) {
@ -150,7 +150,10 @@ const getTargetSchema = (name, plugin) => {
const model = strapi.getModel(name, plugin); const model = strapi.getModel(name, plugin);
if (!model) return null; if (!model) return null;
return formatContentTypeSchema(model); return {
...formatContentTypeSchema(model),
primaryKey: model.primaryKey,
};
}; };
module.exports = { module.exports = {