yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/json-array-pg

Browse Source
This commit is contained in:
Alexandre BODIN 2019-09-13 10:56:28 +02:00 committed by GitHub
commit 09a227c3d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-plugin-content-manager/controllers/validation/model-configuration.js
View File

@ -45,12 +45,12 @@ const createSettingsSchema = (model, schema) => {
// should be reset when the type changes
mainField: yup
.string()
.oneOf(validAttributes)
.oneOf(validAttributes.concat('id'))
.default('id'),
// should be reset when the type changes
defaultSortBy: yup
.string()
.oneOf(validAttributes)
.oneOf(validAttributes.concat('id'))
.default('id'),
defaultSortOrder: yup
.string()