yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-24 16:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix oneWay, manyWay relation validations

Browse Source
This commit is contained in:
soupette 2019-12-03 13:16:45 +01:00
parent 948b49a8b0
commit c77da616f2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/utils/forms.js
View File

@ -206,11 +206,16 @@ const forms = {
.matches(NAME_REGEX, errorsTrads.regex) .matches(NAME_REGEX, errorsTrads.regex)
.unique(errorsTrads.unique, alreadyTakenAttributes) .unique(errorsTrads.unique, alreadyTakenAttributes)
.required(errorsTrads.required), .required(errorsTrads.required),
targetAttribute: yup targetAttribute: yup.lazy(() => {
.string() let schema = yup.string();
.matches(NAME_REGEX, errorsTrads.regex)
.unique(errorsTrads.unique, targetAttributeAlreadyTakenValue) if (!['oneWay', 'manyWay'].includes(dataToValidate.nature)) {
.required(errorsTrads.required), schema = schema.matches(NAME_REGEX, errorsTrads.regex);
}
return schema
.unique(errorsTrads.unique, targetAttributeAlreadyTakenValue)
.required(errorsTrads.required);
}),
target: yup.string().required(errorsTrads.required), target: yup.string().required(errorsTrads.required),
nature: yup.string().required(), nature: yup.string().required(),
dominant: yup.boolean().nullable(), dominant: yup.boolean().nullable(),