Skip to content
Snippets Groups Projects
Commit d228948e authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Fixed a bug when switching between modes

parent a26b26ae
No related branches found
No related tags found
1 merge request!6Feature 4 3
...@@ -96,7 +96,7 @@ class MailController extends ActionController { ...@@ -96,7 +96,7 @@ class MailController extends ActionController {
$this->redirect('index', $this->session->getDataByKey('mode')); $this->redirect('index', $this->session->getDataByKey('mode'));
} }
$registerArray = BackendService::getWhitelistedTemplates(1); $registerArray = BackendService::getWhitelistedTemplates($pid);
$removeExtensionKeys = []; $removeExtensionKeys = [];
foreach ($registerArray as $extensionKey => $extensionTemplates) { foreach ($registerArray as $extensionKey => $extensionTemplates) {
......
...@@ -71,6 +71,8 @@ class QueueController extends ActionController { ...@@ -71,6 +71,8 @@ class QueueController extends ActionController {
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
*/ */
public function indexAction($selectedTemplate = NULL, $selectedExtension = NULL, array $filters = []) { public function indexAction($selectedTemplate = NULL, $selectedExtension = NULL, array $filters = []) {
$pageUid = (int) GeneralUtility::_GP('id');
if (!($this->session instanceof PhpSession)) { if (!($this->session instanceof PhpSession)) {
$this->session = $this->objectManager->get(PhpSession::class); $this->session = $this->objectManager->get(PhpSession::class);
$this->session->setSessionKey('sg_mail_controller_session'); $this->session->setSessionKey('sg_mail_controller_session');
...@@ -95,13 +97,12 @@ class QueueController extends ActionController { ...@@ -95,13 +97,12 @@ class QueueController extends ActionController {
$this->view->assign('selectedTemplateFilter', $filters['filterTemplate']); $this->view->assign('selectedTemplateFilter', $filters['filterTemplate']);
$this->view->assign('selectedExtensionFilter', $filters['filterExtension']); $this->view->assign('selectedExtensionFilter', $filters['filterExtension']);
$registerArray = MailTemplateService::getRegisterArray(); $registerArray = BackendService::getWhitelistedTemplates($pageUid);
if ($selectedTemplate === NULL || $selectedTemplate === '') { if ($selectedTemplate === NULL || $selectedTemplate === '') {
$selectedExtension = key($registerArray); $selectedExtension = key($registerArray);
$selectedTemplate = key($registerArray[$selectedExtension]); $selectedTemplate = key($registerArray[$selectedExtension]);
} }
$pageUid = (int) GeneralUtility::_GP('id');
$queue = $this->mailRepository->findAllEntries($pageUid, 0, $filters); $queue = $this->mailRepository->findAllEntries($pageUid, 0, $filters);
// create doc header component // create doc header component
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment