From fab703b76e8faed668ea1b5d1533d54aacf794c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Fritz?= Date: Thu, 5 Nov 2020 16:57:12 +0100 Subject: [PATCH] Add compatibility for TYPO3 CMS 10.4 --- Configuration/Yaml/FormEditorSetup.yaml | 22 ------------------- .../Yaml/FormElements/MultiCheckbox.yaml | 16 ++++++++++++++ .../Yaml/FormElements/MultiSelect.yaml | 16 ++++++++++++++ .../Yaml/FormElements/SingleSelect.yaml | 20 +++++++++++++++++ Configuration/Yaml/FormSetup.yaml | 4 ++++ composer.json | 2 +- ext_emconf.php | 2 +- ext_localconf.php | 10 +++++++++ ext_typoscript_setup.txt | 7 ------ 9 files changed, 68 insertions(+), 31 deletions(-) delete mode 100644 Configuration/Yaml/FormEditorSetup.yaml create mode 100644 Configuration/Yaml/FormElements/MultiCheckbox.yaml create mode 100644 Configuration/Yaml/FormElements/MultiSelect.yaml create mode 100644 Configuration/Yaml/FormElements/SingleSelect.yaml create mode 100644 Configuration/Yaml/FormSetup.yaml delete mode 100644 ext_typoscript_setup.txt diff --git a/Configuration/Yaml/FormEditorSetup.yaml b/Configuration/Yaml/FormEditorSetup.yaml deleted file mode 100644 index 2550318..0000000 --- a/Configuration/Yaml/FormEditorSetup.yaml +++ /dev/null @@ -1,22 +0,0 @@ -TYPO3: - CMS: - Form: - mixins: - formElementMixins: - SelectionMixin: - formEditor: - predefinedDefaults: - properties: - options: [] - editors: - 310: - identifier: 'options_import' - templateName: 'Inspector-TextareaEditor' - label: Import CSV (; separated) - propertyPath: 'properties.options_import' - prototypes: - standard: - formEditor: - formEditorFluidConfiguration: - partialRootPaths: - 310: 'EXT:form_options_csv/Resources/Private/Backend/Partials/FormEditor/' \ No newline at end of file diff --git a/Configuration/Yaml/FormElements/MultiCheckbox.yaml b/Configuration/Yaml/FormElements/MultiCheckbox.yaml new file mode 100644 index 0000000..9b89c18 --- /dev/null +++ b/Configuration/Yaml/FormElements/MultiCheckbox.yaml @@ -0,0 +1,16 @@ +TYPO3: + CMS: + Form: + prototypes: + standard: + formElementsDefinition: + MultiCheckbox: + formEditor: + editors: + 207: + identifier: name + templateName: Inspector-TextEditor + label: Name + propertyPath: properties.fluidAdditionalAttributes.name + propertyValidators: + 10: NotEmpty diff --git a/Configuration/Yaml/FormElements/MultiSelect.yaml b/Configuration/Yaml/FormElements/MultiSelect.yaml new file mode 100644 index 0000000..ff69928 --- /dev/null +++ b/Configuration/Yaml/FormElements/MultiSelect.yaml @@ -0,0 +1,16 @@ +TYPO3: + CMS: + Form: + prototypes: + standard: + formElementsDefinition: + MultiSelect: + formEditor: + editors: + 207: + identifier: name + templateName: Inspector-TextEditor + label: Name + propertyPath: properties.fluidAdditionalAttributes.name + propertyValidators: + 10: NotEmpty diff --git a/Configuration/Yaml/FormElements/SingleSelect.yaml b/Configuration/Yaml/FormElements/SingleSelect.yaml new file mode 100644 index 0000000..feb369b --- /dev/null +++ b/Configuration/Yaml/FormElements/SingleSelect.yaml @@ -0,0 +1,20 @@ +TYPO3: + CMS: + Form: + prototypes: + standard: + formElementsDefinition: + SingleSelect: + formEditor: + formEditorFluidConfiguration: + partialRootPaths: + 310: 'EXT:form_options_csv/Resources/Private/Backend/Partials/FormEditor/' + predefinedDefaults: + properties: + options: [ ] + editors: + 310: + identifier: 'options_import' + templateName: 'Inspector-TextareaEditor' + label: Import CSV (; separated) + propertyPath: 'properties.options_import' diff --git a/Configuration/Yaml/FormSetup.yaml b/Configuration/Yaml/FormSetup.yaml new file mode 100644 index 0000000..55ab60e --- /dev/null +++ b/Configuration/Yaml/FormSetup.yaml @@ -0,0 +1,4 @@ +imports: + - { resource: "./FormElements/MultiCheckbox.yaml" } + - { resource: "./FormElements/MultiSelect.yaml" } + - { resource: "./FormElements/SingleSelect.yaml" } diff --git a/composer.json b/composer.json index effda46..d3ba1cf 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "plan2net/form-options-csv", "description": "Import CSV data for Core form extension select options", "require": { - "typo3/cms-core": "^8.7 || ^9.5", + "typo3/cms-core": "^8.7 || ^9.5 || ^10.4", "typo3/cms-form": "*" }, "type": "typo3-cms-extension", diff --git a/ext_emconf.php b/ext_emconf.php index 5775be4..70b4631 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -21,7 +21,7 @@ 'version' => '1.2.0', 'constraints' => array( 'depends' => array( - 'typo3' => '8.7.19-9.5.99', + 'typo3' => '8.7.19-10.4.99', 'form' => '*', ), 'conflicts' => array( diff --git a/ext_localconf.php b/ext_localconf.php index 1709c55..1b0feda 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -4,6 +4,16 @@ (function () { if (TYPO3_MODE === 'BE') { + + $typoscript = 'module.tx_form { + settings { + yamlConfigurations { + 1604589938 = EXT:form_options_csv/Configuration/Yaml/FormSetup.yaml + } + } +}'; + \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScriptSetup($typoscript); + $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/form']['beforeFormSave'][] = \Plan2net\FormOptionsCsv\Hooks\ImportSelectOptions::class; } })(); diff --git a/ext_typoscript_setup.txt b/ext_typoscript_setup.txt deleted file mode 100644 index 57dc19a..0000000 --- a/ext_typoscript_setup.txt +++ /dev/null @@ -1,7 +0,0 @@ -module.tx_form { - settings { - yamlConfigurations { - 910 = EXT:form_options_csv/Configuration/Yaml/FormEditorSetup.yaml - } - } -}