diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php b/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php index 92fbda8b..c9cf2b6c 100644 --- a/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php +++ b/public/typo3conf/ext/ep_products/Classes/Controller/ConceptController.php @@ -30,6 +30,7 @@ namespace EP\EpProducts\Controller; use EP\EpProducts\Domain\Model\Concept; use EP\EpProducts\Domain\Repository\ConceptRepository; use EP\EpProducts\Service\ProductDataService; +use EP\EpTheme\Domain\Repository\PageRepository; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Mvc\Controller\ActionController; @@ -46,14 +47,21 @@ class ConceptController extends ActionController */ protected $productDataService; + /** + * @var \EP\EpTheme\Domain\Repository\PageRepository + */ + private $pageRepository; + /** * @param ConceptRepository $conceptRepository * @param ProductDataService $productDataService + * @param PageRepository $pageRepository */ - public function __construct(ConceptRepository $conceptRepository, ProductDataService $productDataService) + public function __construct(ConceptRepository $conceptRepository, ProductDataService $productDataService, PageRepository $pageRepository) { $this->conceptRepository = $conceptRepository; $this->productDataService = $productDataService; + $this->pageRepository = $pageRepository; } /** @@ -75,11 +83,15 @@ class ConceptController extends ActionController $excludedConceptUids = GeneralUtility::trimExplode(',', $this->settings['excludedConceptUids'], true); $limit = $this->settings['showMoreLink'] ? 4 : 0; $teasers = $this->productDataService->getTeasergroup($filterSettings, $excludedConceptUids, $limit); + $pages = $this->pageRepository->findPagesByPid($this->settings['conceptsPageUid']); + $data = $this->configurationManager->getContentObject()->data; $this->view->assignMultiple([ 'teasers' => $teasers, 'concept' => $concept, 'filterSettings' => $filterSettings, + 'pages' => $pages, + 'data' => $data, ]); } diff --git a/public/typo3conf/ext/ep_theme/Configuration/Services.yaml b/public/typo3conf/ext/ep_theme/Configuration/Services.yaml new file mode 100644 index 00000000..10d6f85d --- /dev/null +++ b/public/typo3conf/ext/ep_theme/Configuration/Services.yaml @@ -0,0 +1,9 @@ +services: + _defaults: + autowire: true + autoconfigure: true + public: false + + EP\EpTheme\: + resource: '../Classes/*' + exclude: '../Classes/Domain/Model/*' diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html index c6ae556b..944503d5 100644 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html +++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html @@ -1,8 +1,7 @@ + xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"> @@ -73,16 +72,18 @@