diff --git a/Configuration/NodeTypes.FormElement.yaml b/Configuration/NodeTypes.FormElement.yaml index 2b79798..2b575f3 100644 --- a/Configuration/NodeTypes.FormElement.yaml +++ b/Configuration/NodeTypes.FormElement.yaml @@ -9,7 +9,7 @@ constraints: nodeTypes: '*': false - label: "${q(node).property('identifier') || q(node).property('label') || ((node.nodeType.label || node.nodeTypeName.value) + ' (' + node.name + ')')}" + label: "${q(node).property('identifier') || q(node).property('label') || ((Neos.Node.getNodeType(node).label || node.nodeTypeName.value) + ' (' + node.name + ')')}" ui: inlineEditable: true label: 'Form Element' diff --git a/Configuration/NodeTypes.FormElements.Section.yaml b/Configuration/NodeTypes.FormElements.Section.yaml index 0938bb6..94feb47 100644 --- a/Configuration/NodeTypes.FormElements.Section.yaml +++ b/Configuration/NodeTypes.FormElements.Section.yaml @@ -2,7 +2,7 @@ superTypes: 'Neos.Form.Builder:FormElement': true 'Neos.Form.Builder:SectionMixin': true - 'Neos.Form.Builder:IdentifierMixin': false + 'Neos.Form.Builder:IdentifierMixin': true 'Neos.Form.Builder:DefaultValueMixin': false 'Neos.Form.Builder:RequiredCheckboxMixin': false ui: diff --git a/Configuration/NodeTypes.SelectOption.yaml b/Configuration/NodeTypes.SelectOption.yaml index 19f7c6f..ff28575 100644 --- a/Configuration/NodeTypes.SelectOption.yaml +++ b/Configuration/NodeTypes.SelectOption.yaml @@ -33,7 +33,7 @@ options: nodeCreationHandlers: documentTitle: - nodeCreationHandler: 'Neos\Form\Builder\NodeType\SelectOptionsCreationHandler' + factoryClassName: 'Neos\Form\Builder\NodeType\SelectOptionsCreationHandler' fusion: prototypeGenerator: null properties: diff --git a/Resources/Private/Fusion/NodeBased/NodeBasedFinisher.fusion b/Resources/Private/Fusion/NodeBased/NodeBasedFinisher.fusion index a11f436..7f581aa 100644 --- a/Resources/Private/Fusion/NodeBased/NodeBasedFinisher.fusion +++ b/Resources/Private/Fusion/NodeBased/NodeBasedFinisher.fusion @@ -9,7 +9,7 @@ prototype(Neos.Form.Builder:NodeBasedFinisherCollection) < prototype(Neos.Fusion itemName = 'finisherNode' itemRenderer = Neos.Fusion:Case { formElementTypeFromNodeType { - condition = ${!finisherNode.nodeType.options.form.formElementType} + condition = ${!Neos.Node.getNodeType(finisherNode).options.form.formElementType} renderer = Neos.Form.Builder:NodeBasedFinisher { type = ${finisherNode.nodeTypeName.value + '.Definition'} } @@ -19,7 +19,7 @@ prototype(Neos.Form.Builder:NodeBasedFinisherCollection) < prototype(Neos.Fusion condition = ${true} renderer = Neos.Form.Builder:NodeBasedFinisher { type = 'Neos.Form.Builder:Finisher.Definition' - element.formElementType = ${finisherNode.nodeType.options.form.formElementType} + element.formElementType = ${Neos.Node.getNodeType(finisherNode).options.form.formElementType} } } } diff --git a/Resources/Private/Fusion/NodeBased/NodeBasedFormElement.fusion b/Resources/Private/Fusion/NodeBased/NodeBasedFormElement.fusion index 80ed25b..efe7f88 100644 --- a/Resources/Private/Fusion/NodeBased/NodeBasedFormElement.fusion +++ b/Resources/Private/Fusion/NodeBased/NodeBasedFormElement.fusion @@ -30,7 +30,7 @@ prototype(Neos.Form.Builder:NodeBasedElementCollection) < prototype(Neos.Fusion: itemName = 'elementNode' itemRenderer = Neos.Fusion:Case { formElementTypeFromNodeType { - condition = ${!elementNode.nodeType.options.form.formElementType} + condition = ${!Neos.Node.getNodeType(elementNode).options.form.formElementType} renderer = Neos.Form.Builder:NodeBasedFormElement { type = ${elementNode.nodeTypeName.value + '.Definition'} } @@ -39,7 +39,7 @@ prototype(Neos.Form.Builder:NodeBasedElementCollection) < prototype(Neos.Fusion: condition = ${true} renderer = Neos.Form.Builder:NodeBasedFormElement { type = 'Neos.Form.Builder:FormElement.Definition' - element.formElementType = ${elementNode.nodeType.options.form.formElementType} + element.formElementType = ${Neos.Node.getNodeType(elementNode).options.form.formElementType} } } } diff --git a/Resources/Private/Fusion/NodeBased/NodeBasedFormPage.fusion b/Resources/Private/Fusion/NodeBased/NodeBasedFormPage.fusion index 03c728e..eea05d1 100644 --- a/Resources/Private/Fusion/NodeBased/NodeBasedFormPage.fusion +++ b/Resources/Private/Fusion/NodeBased/NodeBasedFormPage.fusion @@ -16,7 +16,7 @@ prototype(Neos.Form.Builder:NodeBasedPageCollection) < prototype(Neos.Fusion:Loo itemName = 'pageNode' itemRenderer = Neos.Fusion:Case { formElementTypeFromNodeType { - condition = ${!pageNode.nodeType.options.form.formElementType} + condition = ${!Neos.Node.getNodeType(pageNode).options.form.formElementType} renderer = Neos.Form.Builder:NodeBasedFormPage { type = ${pageNode.nodeTypeName.value + '.Definition'} } @@ -26,7 +26,7 @@ prototype(Neos.Form.Builder:NodeBasedPageCollection) < prototype(Neos.Fusion:Loo condition = ${true} renderer = Neos.Form.Builder:NodeBasedFormPage { type = 'Neos.Form.Builder:FormPage.Definition' - element.formElementType = ${pageNode.nodeType.options.form.formElementType} + element.formElementType = ${Neos.Node.getNodeType(pageNode).options.form.formElementType} } } } diff --git a/Resources/Private/Fusion/NodeBased/NodeBasedValidator.fusion b/Resources/Private/Fusion/NodeBased/NodeBasedValidator.fusion index c312caa..eec9087 100644 --- a/Resources/Private/Fusion/NodeBased/NodeBasedValidator.fusion +++ b/Resources/Private/Fusion/NodeBased/NodeBasedValidator.fusion @@ -9,7 +9,7 @@ prototype(Neos.Form.Builder:NodeBasedValidatorCollection) < prototype(Neos.Fusio itemName = 'validatorNode' itemRenderer = Neos.Fusion:Case { formElementTypeFromNodeType { - condition = ${!validatorNode.nodeType.options.form.formElementType} + condition = ${!Neos.Node.getNodeType(validatorNode).options.form.formElementType} renderer = Neos.Form.Builder:NodeBasedValidator { type = ${validatorNode.nodeTypeName.value + '.Definition'} } @@ -19,7 +19,7 @@ prototype(Neos.Form.Builder:NodeBasedValidatorCollection) < prototype(Neos.Fusio condition = ${true} renderer = Neos.Form.Builder:NodeBasedValidator { type = 'Neos.Form.Builder:Validator.Definition' - element.formElementType = ${validatorNode.nodeType.options.form.formElementType} + element.formElementType = ${Neos.Node.getNodeType(validatorNode).options.form.formElementType} } } }