tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6694 from open-sausages/pulls/4.0/yarn-patch

Browse Source 
BUG work-around for form property on formfields not working
This commit is contained in:
Damian Mooyman 2017-03-10 16:43:26 +13:00 committed by GitHub
commit 644ae60fac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/client/dist/js/bundle.js vendored
View File

@ -322,7 +322,7 @@ n=l({},n,n.input),delete n.input
var i=this.props.createFn var i=this.props.createFn
return"function"==typeof i?i(r,n):f.default.createElement(r,l({key:n.id},n))}},{key:"mapFieldsToComponents",value:function e(t){var n=this,r=this.props.baseFieldComponent return"function"==typeof i?i(r,n):f.default.createElement(r,l({key:n.id},n))}},{key:"mapFieldsToComponents",value:function e(t){var n=this,r=this.props.baseFieldComponent
return t.map(function(e){var t=e return t.map(function(e){var t=e
return e.children&&(t=l({},e,{children:n.mapFieldsToComponents(e.children)})),t=l({onAutofill:n.props.onAutofill,form:n.props.form},t),"Structural"===e.type||e.readOnly===!0?n.buildComponent(t):f.default.createElement(r,l({ return e.children&&(t=l({},e,{children:n.mapFieldsToComponents(e.children)})),t=l({onAutofill:n.props.onAutofill,formid:n.props.form},t),"Structural"===e.type||e.readOnly===!0?n.buildComponent(t):f.default.createElement(r,l({
key:t.id},t,{component:n.buildComponent}))})}},{key:"mapActionsToComponents",value:function e(t){var n=this key:t.id},t,{component:n.buildComponent}))})}},{key:"mapActionsToComponents",value:function e(t){var n=this
return t.map(function(e){var t=l({},e) return t.map(function(e){var t=l({},e)
return e.children?t.children=n.mapActionsToComponents(e.children):(t.handleClick=n.handleAction,n.props.submitting&&n.state.submittingAction===e.name&&(t.loading=!0)),n.buildComponent(t)})}},{key:"normalizeFields", return e.children?t.children=n.mapActionsToComponents(e.children):(t.handleClick=n.handleAction,n.props.submitting&&n.state.submittingAction===e.name&&(t.loading=!0)),n.buildComponent(t)})}},{key:"normalizeFields",

2
admin/client/src/components/FormBuilder/FormBuilder.js
View File

@ -187,7 +187,7 @@ class FormBuilder extends SilverStripeComponent {
props = Object.assign( props = Object.assign(
{ {
onAutofill: this.props.onAutofill, onAutofill: this.props.onAutofill,
form: this.props.form, formid: this.props.form,
}, },
props props
); );