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

use FormError

Browse source
This commit is contained in:
ochicf 2018-06-27 19:33:06 +02:00
parent 54cfd87923
commit 198d912be7
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/vulcan-forms/lib/components/FieldErrors.jsx
View file

@ -1,19 +1,12 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { registerComponent } from 'meteor/vulcan:core'; import { registerComponent, Components } from 'meteor/vulcan:core';
import { FormattedMessage } from 'meteor/vulcan:i18n';
const FieldErrors = ({ errors }) => ( const FieldErrors = ({ errors }) => (
<ul className="form-input-errors"> <ul className="form-input-errors">
{errors.map((error, index) => ( {errors.map((error, index) => (
<li key={index}> <li key={index}>
{error.message || ( <Components.FormError error={error} context="field" />
<FormattedMessage
id={error.id}
values={{ ...error.data, ...error.properties }} //keep data for backwards compatibility ?
defaultMessage={JSON.stringify(error)}
/>
)}
</li> </li>
))} ))}
</ul> </ul>

9
packages/vulcan-forms/lib/components/FormErrors.jsx
View file

@ -1,7 +1,6 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { registerComponent, Components } from 'meteor/vulcan:core'; import { registerComponent, Components } from 'meteor/vulcan:core';
import { FormattedMessage } from 'meteor/vulcan:i18n';
const FormErrors = ({ errors }) => ( const FormErrors = ({ errors }) => (
<div className="form-errors"> <div className="form-errors">
@ -10,13 +9,7 @@ const FormErrors = ({ errors }) => (
<ul> <ul>
{errors.map((error, index) => ( {errors.map((error, index) => (
<li key={index}> <li key={index}>
{error.message || ( <Components.FormError error={error} context="form" />
<FormattedMessage
id={error.id}
values={{ ...error.properties }}
defaultMessage={JSON.stringify(error)}
/>
)}
</li> </li>
))} ))}
</ul> </ul>