Merge branch 'release/2021.08-01'

public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php

@@ -67,8 +67,10 @@ class ConceptController extends ActionController
             $conceptUid = $this->settings['conceptUid'];
             $concept = $this->conceptRepository->findByIdentifier($conceptUid);
         }
+        $teaserConceptUids = GeneralUtility::trimExplode(',', $this->settings['additionalConceptUids']);
+        array_unshift($teaserConceptUids, $concept->getUid());
         $filterSettings = new FilterSettings();
-        $filterSettings->setConceptUids([$concept->getUid()]);
+        $filterSettings->setConceptUids($teaserConceptUids);
         $excludedConceptUids = GeneralUtility::trimExplode(',', $this->settings['excludedConceptUids'], true);
         $limit = $this->settings['showMoreLink'] ? 4 : 0;
         $teasers = $this->productDataService->getTeasergroup($filterSettings, $excludedConceptUids, $limit);

public/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_concept_detail.xml

@@ -25,11 +25,25 @@
 										<numIndex index="1">0</numIndex>
 									</numIndex>
 								</items>
-								<minitems>0</minitems>
+								<minitems>1</minitems>
 								<maxitems>1</maxitems>
 							</config>
 						</TCEforms>
 					</settings.conceptUid>
+					<settings.additionalConceptUids>
+						<TCEforms>
+							<label>Weitere Konzepte für Teaser:</label>
+							<config>
+								<type>select</type>
+								<renderType>selectSingleBox</renderType>
+								<foreign_table>tx_epproducts_domain_model_concept</foreign_table>
+								<foreign_table_where>AND tx_epproducts_domain_model_concept.hidden = 0 AND tx_epproducts_domain_model_concept.deleted = 0 ORDER BY tx_epproducts_domain_model_concept.name</foreign_table_where>
+								<size>5</size>
+								<minitems>0</minitems>
+								<maxitems>10</maxitems>
+							</config>
+						</TCEforms>
+					</settings.additionalConceptUids>
 					<settings.showMoreLink>
 						<TCEforms>
 							<exclude>0</exclude>