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

Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel

Browse source
This commit is contained in:
SachaG 2018-04-21 17:58:29 +09:00
commit 299d83df98
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/vulcan-forms/lib/components/Form.jsx
View file

@ -292,10 +292,10 @@ class Form extends Component {
field.help = fieldSchema.description; field.help = fieldSchema.description;
} }
// nested fields: set formInput to "nested" // nested fields: set input to "nested"
if (fieldSchema.schema) { if (fieldSchema.schema) {
field.nestedSchema = fieldSchema.schema; field.nestedSchema = fieldSchema.schema;
field.formInput = 'nested'; field.input = 'nested';
// get nested schema // get nested schema
// for each nested field, get field object by calling createField recursively // for each nested field, get field object by calling createField recursively
field.nestedFields = this.getFieldNames({ schema: field.nestedSchema }).map(subFieldName => { field.nestedFields = this.getFieldNames({ schema: field.nestedSchema }).map(subFieldName => {

4
packages/vulcan-forms/lib/components/FormNested.jsx
View file

@ -62,8 +62,8 @@ class FormNested extends PureComponent {
}; };
render() { render() {
// do not pass FormNested's own value and control props down // do not pass FormNested's own value, control and inputProperties props down
const properties = _.omit(this.props, 'value', 'control'); const properties = _.omit(this.props, 'value', 'control', 'inputProperties');
return ( return (
<div className="form-group row form-nested"> <div className="form-group row form-nested">