From f3b3a7094820cbb6c4269f24f49deba35dd7d7c0 Mon Sep 17 00:00:00 2001 From: Dirk Koritnik Date: Fri, 17 Mar 2023 12:58:06 +0100 Subject: [PATCH] Remove rte config fram tca, fix text cleanup from linebreaks (#3) --- .../Service/DestinationDataImportService.php | 6 ++-- .../TCA/tx_events_domain_model_event.php | 1 - Documentation/Changelog/3.2.2.rst | 28 +++++++++++++++++++ .../Assertions/ImportsExampleAsExpected.csv | 2 -- 4 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 Documentation/Changelog/3.2.2.rst diff --git a/Classes/Service/DestinationDataImportService.php b/Classes/Service/DestinationDataImportService.php index e57c92d..86cd333 100644 --- a/Classes/Service/DestinationDataImportService.php +++ b/Classes/Service/DestinationDataImportService.php @@ -423,13 +423,13 @@ class DestinationDataImportService } if ($text['rel'] == "details" && $text['type'] == "text/plain") { - $this->tmpCurrentEvent->setDetails(str_replace('\n\n', '\n', $text['value'])); + $this->tmpCurrentEvent->setDetails(str_replace("\n\n", "\n", $text['value'])); } if ($text['rel'] == "teaser" && $text['type'] == "text/plain") { - $this->tmpCurrentEvent->setTeaser(str_replace('\n\n', '\n', $text['value'])); + $this->tmpCurrentEvent->setTeaser(str_replace("\n\n", "\n", $text['value'])); } if ($text['rel'] == "PRICE_INFO" && $text['type'] == "text/plain") { - $this->tmpCurrentEvent->setPriceInfo(str_replace('\n\n', '\n', $text['value'])); + $this->tmpCurrentEvent->setPriceInfo(str_replace("\n\n", "\n", $text['value'])); } } } diff --git a/Configuration/TCA/tx_events_domain_model_event.php b/Configuration/TCA/tx_events_domain_model_event.php index b9f7e1b..95a0b35 100644 --- a/Configuration/TCA/tx_events_domain_model_event.php +++ b/Configuration/TCA/tx_events_domain_model_event.php @@ -232,7 +232,6 @@ return [ 'config' => [ 'type' => 'text', 'enableRichtext' => true, - 'richtextConfiguration' => 'Default', 'fieldControl' => [ 'fullScreenRichtext' => [ 'disabled' => false, diff --git a/Documentation/Changelog/3.2.2.rst b/Documentation/Changelog/3.2.2.rst new file mode 100644 index 0000000..8132891 --- /dev/null +++ b/Documentation/Changelog/3.2.2.rst @@ -0,0 +1,28 @@ +3.2.2 +===== + +Breaking +-------- + +Nothing + +Features +-------- + +Nothing + +Fixes +----- + +* Remove missing rte config from events TCA +* Fix linebreak replacement in import + +Tasks +----- + +Nothing + +Deprecation +----------- + +Nothing diff --git a/Tests/Functional/Import/DestinationDataTest/Assertions/ImportsExampleAsExpected.csv b/Tests/Functional/Import/DestinationDataTest/Assertions/ImportsExampleAsExpected.csv index 772714a..5ac991e 100644 --- a/Tests/Functional/Import/DestinationDataTest/Assertions/ImportsExampleAsExpected.csv +++ b/Tests/Functional/Import/DestinationDataTest/Assertions/ImportsExampleAsExpected.csv @@ -11,10 +11,8 @@ Um Voranmeldung unter 03672-486470 oder schillerhaus@rudolstadt.de wird gebeten. Es gilt die 2G-PLUS-Regel.",,"http://www.schillerhaus.rudolstadt.de/",,,,,"1","1",,"1","1",,"1",,1,"allerlei-weihnachtliches-heute-mit-johannes-geisser" ,"2","2","0","0","0","0","0","-1","0","0","0","0","0","Tüftlerzeit",,"e_100354481","e-100354481","0",,"Die Tüftlerzeit wird dieses Mal ein weihnachtliches Angebot bereithalten. Alle kleinen Tüftler dürfen gespannt sein. Voranmeldung über: kinderbibliothek@rudolstadt.de oder 03672-486420 - Bitte beachten Sie die derzeit geltenden Zugangsregeln.",,"http://www.stadtbibliothek-rudolstadt.de/",,,,,"1","1",,"4","2",,"1",,2,"tueftlerzeit" ,"3","2","0","0","0","0","0","-1","0","0","0","0","0","Adventliche Orgelmusik (Orgel: KMD Frank Bettenhausen)",,"e_100350503","e-100350503","0",,"Immer mittwochs in der Adventszeit spielt Frank Bettenhausen solo und zusammen mit anderen Musikern auf der Steinmeyerorgel aus dem Jahr 1906. Bekannte Adventslieder, barocke und romantische Kompositionen stehen neben besinnlichen Texten von Pfarrer Johannes-Martin Weiss. - Es gilt die 2G-PLUS-Regel.",,,,,,,"1","2",,"8","3",,"1",,3,"adventliche-orgelmusik-orgel-kmd-frank-bettenhausen" "tx_events_domain_model_date",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, ,"uid","pid","cruser_id","hidden","starttime","endtime","sys_language_uid","l10n_parent","t3ver_oid","t3ver_wsid","t3ver_state","event","start","end","canceled","postponed_date","canceled_link","slug",,,,,,,,,,,,,,,,,,