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

API Scaffolded redux form fields have the parent form name assigned as a property

Browse Source 
Requirement for https://github.com/silverstripe/silverstripe-asset-admin/pull/370
This commit is contained in:
Damian Mooyman 2017-01-18 11:49:09 +13:00
parent 8b4cce435e
commit 3033953cc9
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -384,7 +384,7 @@ t=l({},t,t.input),delete t.input
var i=this.props.createFn var i=this.props.createFn
return"function"==typeof i?i(n,t):f["default"].createElement(n,l({key:t.id},t))}},{key:"mapFieldsToComponents",value:function v(e){var t=this,n=this.props.baseFieldComponent return"function"==typeof i?i(n,t):f["default"].createElement(n,l({key:t.id},t))}},{key:"mapFieldsToComponents",value:function v(e){var t=this,n=this.props.baseFieldComponent
return e.map(function(e){var i=e return e.map(function(e){var i=e
return e.children&&(i=l({},e,{children:t.mapFieldsToComponents(e.children)})),i=l({onAutofill:t.props.onAutofill},i),"Structural"===e.type||e.readOnly===!0?t.buildComponent(i):f["default"].createElement(n,l({ return e.children&&(i=l({},e,{children:t.mapFieldsToComponents(e.children)})),i=l({onAutofill:t.props.onAutofill,form:t.props.form},i),"Structural"===e.type||e.readOnly===!0?t.buildComponent(i):f["default"].createElement(n,l({
key:i.id},i,{component:t.buildComponent}))})}},{key:"mapActionsToComponents",value:function y(e){var t=this key:i.id},i,{component:t.buildComponent}))})}},{key:"mapActionsToComponents",value:function y(e){var t=this
return e.map(function(e){var n=l({},e) return e.map(function(e){var n=l({},e)
return e.children?n.children=t.mapActionsToComponents(e.children):(n.handleClick=t.handleAction,t.props.submitting&&t.state.submittingAction===e.name&&(n.loading=!0)),t.buildComponent(n)})}},{key:"normalizeFields", return e.children?n.children=t.mapActionsToComponents(e.children):(n.handleClick=t.handleAction,t.props.submitting&&t.state.submittingAction===e.name&&(n.loading=!0)),t.buildComponent(n)})}},{key:"normalizeFields",
@ -425,7 +425,7 @@ case"alpha":return u["default"].isAlpha(e)
case"regex":return u["default"].matches(e,n.pattern) case"regex":return u["default"].matches(e,n.pattern)
case"max":return e.length<=n.length case"max":return e.length<=n.length
case"email":return u["default"].isEmail(e) case"email":return u["default"].isEmail(e)
default:console.warn("Unknown validation rule used: '"+t+"'")}}},{key:"validateFieldSchema",value:function l(e){return this.validateField(e.name,e.validation,null!==e.leftTitle?e.leftTitle:e.title,e.customValidationMessage) default:return console.warn("Unknown validation rule used: '"+t+"'"),!1}}},{key:"validateFieldSchema",value:function l(e){return this.validateField(e.name,e.validation,null!==e.leftTitle?e.leftTitle:e.title,e.customValidationMessage)
}},{key:"getMessage",value:function d(e,t){var n="" }},{key:"getMessage",value:function d(e,t){var n=""
if("string"==typeof t.message)n=t.message if("string"==typeof t.message)n=t.message

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

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