[TASK] Update LUXletter for usage of georgringer/news 11.0.0 or newer

Because news uses own CType instead of list_type elements, we have to adjust the templates related to newslists Related: https://github.com/in2code-de/luxletter/pull/204/files
in2code-de · Feb 2, 2024 · 9ecde16 · 9ecde16
1 parent fa66ff9
commit 9ecde16
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/Configuration/TypoScript/FluidStyledMailContent/setup.typoscript b/Configuration/TypoScript/FluidStyledMailContent/setup.typoscript
@@ -34,6 +34,11 @@ lib {
 }
 
 // Settings for EXT:news
+tt_content {
+  news_pi1.templateName = NewsList
+  news_newsliststicky.templateName = NewsList
+  news_newsselectedlist.templateName = NewsList
+}
 plugin.tx_news {
   view {
     templateRootPaths {

diff --git a/Resources/Private/FluidStyledMailContent/Templates/List.html b/Resources/Private/FluidStyledMailContent/Templates/List.html
@@ -1,8 +1 @@
-<f:if condition="{data.list_type} == 'news_pi1'">
-    <f:then>
-        <f:cObject typoscriptObjectPath="tt_content.list.20.{data.list_type}" data="{data}" table="tt_content" />
-    </f:then>
-    <f:else>
-        <f:render partial="NotYetSupported" arguments="{_all}"/>
-    </f:else>
-</f:if>
+<f:render partial="NotYetSupported" arguments="{_all}"/>
diff --git a/Resources/Private/FluidStyledMailContent/Templates/NewsList.html b/Resources/Private/FluidStyledMailContent/Templates/NewsList.html
@@ -0,0 +1 @@
+<f:cObject typoscriptObjectPath="tt_content.{data.CType}.20" data="{data}" table="tt_content" />
diff --git a/composer.json b/composer.json
@@ -83,6 +83,9 @@
 		"helmich/typo3-typoscript-lint": "^3.1",
 		"helhum/typo3-console": "^8.0.x-dev"
 	},
+	"conflict": {
+		"georgringer/news": "< 11.0.0"
+	},
 	"config": {
 		"vendor-dir": ".Build/vendor",
 		"bin-dir": ".Build/bin",

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -13,7 +13,9 @@
         'depends' => [
             'typo3' => '11.5.0-12.4.99'
         ],
-        'conflicts' => [],
+        'conflicts' => [
+            'news' => '9.0.0-10.99.99'
+        ],
         'suggests' => [
             'lux' => '0.0.0-0.0.0',
             'dashboard' => '0.0.0-0.0.0'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<f:cObject typoscriptObjectPath="tt_content.{data.CType}.20" data="{data}" table="tt_content" />