From 2f801f9319a27c698bde4d0d951b106fc724e3fa Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 7 Apr 2016 22:35:52 +1200 Subject: [PATCH] Pass all field attributes via Also make them immutable via deep-freeze --- .../src/components/form-builder/index.js | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/admin/javascript/src/components/form-builder/index.js b/admin/javascript/src/components/form-builder/index.js index 2630f7032..7ad38cea6 100644 --- a/admin/javascript/src/components/form-builder/index.js +++ b/admin/javascript/src/components/form-builder/index.js @@ -8,6 +8,7 @@ import TextField from 'components/text-field/index'; import HiddenField from 'components/hidden-field/index'; import GridField from 'components/grid-field/index'; import fetch from 'isomorphic-fetch'; +import deepFreeze from 'deep-freeze'; import es6promise from 'es6-promise'; es6promise.polyfill(); @@ -130,30 +131,9 @@ export class FormBuilderComponent extends SilverStripeComponent { } // Props which every form field receives. - const props = { - attributes: field.attributes, - data: field.data, - description: field.description, - extraClass: field.extraClass, - fields: field.children, - id: field.id, - name: field.name, - }; - - // Structural fields (like TabSets) are not posted back to - // the server and don't receive some props. - if (field.type !== 'Structural') { - props.rightTitle = field.rightTitle; - props.leftTitle = field.leftTitle; - props.readOnly = field.readOnly; - props.disabled = field.disabled; - props.customValidationMessage = field.customValidationMessage; - } - - // Dropdown and Radio fields need some options... - if (field.type === 'MultiSelect' || field.type === 'SingleSelect') { - props.source = field.source; - } + // Leave it up to the schema and component to determine + // which props are required. + const props = deepFreeze(field); return ; });