From 53cdc6e9f425e745080e80ac7be40c3126ce68f4 Mon Sep 17 00:00:00 2001 From: Oliver Bartsch <bo@cedev.de> Date: Tue, 11 Apr 2023 14:14:37 +0200 Subject: [PATCH] [BUGFIX] Make grid selection available for Number form element This fixes the YAML configuration of the "Number" form element, making the gird selection available. Resolves: #98930 Resolves: #100412 Releases: main, 11.5 Change-Id: I1586adfc41c00070e00db10a1b71d614f34f3466 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78561 Tested-by: Oliver Bartsch <bo@cedev.de> Reviewed-by: Oliver Bartsch <bo@cedev.de> Tested-by: core-ci <typo3@b13.com> --- .../Yaml/FormElements/Number.yaml | 12 ++++--- .../formElementTypes/Number/formEditor.rst | 26 ++++++++++++-- .../Number/formEditor/editors/550.rst | 36 +++++++++++++++++++ .../Number/formEditor/editors/700.rst | 29 +++++++++++---- 4 files changed, 90 insertions(+), 13 deletions(-) create mode 100644 typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/550.rst diff --git a/typo3/sysext/form/Configuration/Yaml/FormElements/Number.yaml b/typo3/sysext/form/Configuration/Yaml/FormElements/Number.yaml index 5d31cfe38fbe..eae1e27d4f79 100644 --- a/typo3/sysext/form/Configuration/Yaml/FormElements/Number.yaml +++ b/typo3/sysext/form/Configuration/Yaml/FormElements/Number.yaml @@ -33,10 +33,17 @@ TYPO3: propertyPath: defaultValue propertyValidators: 10: IntegerOrEmpty - 700: + 550: identifier: step templateName: Inspector-TextEditor label: formEditor.elements.TextMixin.editor.step.label + propertyPath: properties.fluidAdditionalAttributes.step + propertyValidators: + 10: Integer + 700: + identifier: gridColumnViewPortConfiguration + templateName: Inspector-GridColumnViewPortConfigurationEditor + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.label configurationOptions: viewPorts: 10: @@ -61,9 +68,6 @@ TYPO3: label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.label propertyPath: 'properties.gridColumnClassAutoConfiguration.viewPorts.{@viewPortIdentifier}.numbersOfColumnsToUse' fieldExplanationText: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.fieldExplanationText - propertyPath: properties.fluidAdditionalAttributes.step - propertyValidators: - 10: Integer 800: identifier: requiredValidator templateName: Inspector-RequiredValidatorEditor diff --git a/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor.rst b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor.rst index 507869198c52..06b2ecb2f902 100644 --- a/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor.rst +++ b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor.rst @@ -30,7 +30,7 @@ formEditor templateName: Inspector-TextEditor label: formEditor.elements.FormElement.editor.label.label propertyPath: label - 230: + 230: identifier: elementDescription templateName: Inspector-TextEditor label: formEditor.elements.FormElement.editor.elementDescription.label @@ -48,13 +48,35 @@ formEditor propertyPath: defaultValue propertyValidators: 10: IntegerOrEmpty - 700: + 550: identifier: step templateName: Inspector-TextEditor label: formEditor.elements.TextMixin.editor.step.label propertyPath: properties.fluidAdditionalAttributes.step propertyValidators: 10: Integer + 700: + identifier: gridColumnViewPortConfiguration + templateName: Inspector-GridColumnViewPortConfigurationEditor + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.label + configurationOptions: + viewPorts: + 10: + viewPortIdentifier: xs + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.xs.label + 20: + viewPortIdentifier: sm + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.sm.label + 30: + viewPortIdentifier: md + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.md.label + 40: + viewPortIdentifier: lg + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.lg.label + numbersOfColumnsToUse: + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.label + propertyPath: 'properties.gridColumnClassAutoConfiguration.viewPorts.{@viewPortIdentifier}.numbersOfColumnsToUse' + fieldExplanationText: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.fieldExplanationText 800: identifier: requiredValidator templateName: Inspector-RequiredValidatorEditor diff --git a/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/550.rst b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/550.rst new file mode 100644 index 000000000000..73c718bc8bff --- /dev/null +++ b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/550.rst @@ -0,0 +1,36 @@ +.. include:: /Includes.rst.txt + +formEditor.editors.550 +---------------------- + +:aspect:`Option path` + TYPO3.CMS.Form.prototypes.<prototypeIdentifier>.formElementsDefinition.Number.formEditor.editors.550 + +:aspect:`Data type` + array/ :ref:`[TextEditor] <typo3.cms.form.prototypes.\<prototypeidentifier>.formelementsdefinition.\<formelementtypeidentifier>.formeditor.editors.*.texteditor>` + +:aspect:`Needed by` + Backend (form editor) + +:aspect:`Mandatory` + Recommended + +.. :aspect:`Related options` + @ToDo + +:aspect:`Default value (for prototype 'standard')` + .. code-block:: yaml + :linenos: + :emphasize-lines: 4- + + Number: + formEditor: + editors: + 550: + identifier: step + templateName: Inspector-TextEditor + label: formEditor.elements.TextMixin.editor.step.label + propertyPath: properties.fluidAdditionalAttributes.step + propertyValidators: + 10: Integer + diff --git a/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/700.rst b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/700.rst index 433dfeb5e26f..7e8ed881818b 100644 --- a/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/700.rst +++ b/typo3/sysext/form/Documentation/I/Config/proto/formElements/formElementTypes/Number/formEditor/editors/700.rst @@ -7,7 +7,7 @@ formEditor.editors.700 TYPO3.CMS.Form.prototypes.<prototypeIdentifier>.formElementsDefinition.Number.formEditor.editors.700 :aspect:`Data type` - array/ :ref:`[TextEditor] <typo3.cms.form.prototypes.\<prototypeidentifier>.formelementsdefinition.\<formelementtypeidentifier>.formeditor.editors.*.texteditor>` + array/ :ref:`[GridColumnViewPortConfigurationEditor] <typo3.cms.form.prototypes.\<prototypeidentifier>.formelementsdefinition.\<formelementtypeidentifier>.formeditor.editors.*.gridcolumnviewportconfigurationeditor>` :aspect:`Needed by` Backend (form editor) @@ -27,10 +27,25 @@ formEditor.editors.700 formEditor: editors: 700: - identifier: step - templateName: Inspector-TextEditor - label: formEditor.elements.TextMixin.editor.step.label - propertyPath: properties.fluidAdditionalAttributes.step - propertyValidators: - 10: Integer + identifier: gridColumnViewPortConfiguration + templateName: Inspector-GridColumnViewPortConfigurationEditor + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.label + configurationOptions: + viewPorts: + 10: + viewPortIdentifier: xs + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.xs.label + 20: + viewPortIdentifier: sm + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.sm.label + 30: + viewPortIdentifier: md + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.md.label + 40: + viewPortIdentifier: lg + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.lg.label + numbersOfColumnsToUse: + label: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.label + propertyPath: 'properties.gridColumnClassAutoConfiguration.viewPorts.{@viewPortIdentifier}.numbersOfColumnsToUse' + fieldExplanationText: formEditor.elements.FormElement.editor.gridColumnViewPortConfiguration.numbersOfColumnsToUse.fieldExplanationText -- GitLab