Merge branch 'develop' into feature/stimulus

This commit is contained in:
Björn Fromme
2021-09-14 14:53:53 +02:00
@@ -66,10 +66,11 @@ class ConceptController extends ActionController
$concept = $this->conceptRepository->findByIdentifier($conceptUid);
}
$teaserConceptUids = GeneralUtility::trimExplode(',', $this->settings['additionalConceptUids']);
array_unshift($teaserConceptUids, $concept->getUid());
$filterSettings = [
'conceptUids' => $teaserConceptUids,
];
if (null !== $concept) {
array_unshift($teaserConceptUids, $concept->getUid());
}
$filterSettings = new FilterSettings();
$filterSettings->setConceptUids($teaserConceptUids);
$excludedConceptUids = GeneralUtility::trimExplode(',', $this->settings['excludedConceptUids'], true);
$limit = $this->settings['showMoreLink'] ? 4 : 0;
$teasers = $this->productDataService->getTeasergroup($filterSettings, $excludedConceptUids, $limit);