hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 10:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Missed a conflict

Browse source
This commit is contained in:
SachaG 2018-06-30 09:33:31 +02:00
parent 5f7d9f792f
commit 12dd5b1141
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/vulcan-lib/lib/modules/validation.js
View file

@ -47,26 +47,19 @@ export const validateDocument = (document, collection, context) => {
errors.forEach(error => { errors.forEach(error => {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
// console.log(error); // console.log(error);
<<<<<<< HEAD
if (error.type.includes('intlError')) { if (error.type.includes('intlError')) {
validationErrors = validationErrors.concat(JSON.parse(error.type.replace('intlError|', ''))); validationErrors = validationErrors.concat(JSON.parse(error.type.replace('intlError|', '')));
} else { } else {
validationErrors.push({
id: `errors.${error.type}`,
path: error.name,
properties: error,
});
}
=======
validationErrors.push({ validationErrors.push({
id: `errors.${error.type}`, id: `errors.${error.type}`,
path: error.name, path: error.name,
properties: { properties: {
collection: collection._name, collectionName: collection.options.collectionName,
typeName: collection.options.typeName,
...error, ...error,
}, },
}); });
>>>>>>> 1433ca96294c4c03d060df0708971e8100945f08 }
}); });
} }