From 562a1fe4da4b3d22b376e3e3cd7865356c885435 Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Sun, 30 Jul 2017 22:01:21 +0200
Subject: [PATCH] [BUGFIX] Fixing the loss of template & extension key when
sending/resending a mail from the queue
---
Classes/Controller/QueueController.php | 4 +++-
Resources/Private/Templates/Queue/Index.html | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Classes/Controller/QueueController.php b/Classes/Controller/QueueController.php
index 2b7c0b46..3ba6e653 100644
--- a/Classes/Controller/QueueController.php
+++ b/Classes/Controller/QueueController.php
@@ -98,13 +98,15 @@ class QueueController extends ActionController {
* send or resend a mail in the queue
*
* @param int $uid
+ * @param string $selectedTemplate
+ * @param string $selectedExtension
* @throws \InvalidArgumentException
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
* @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
* @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
* @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
*/
- public function sendMailAction($uid) {
+ public function sendMailAction($uid, $selectedTemplate, $selectedExtension) {
$mailService = new MailTemplateService();
$mailService->sendMailFromQueue($uid);
diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index bf640bfa..5ac4bda4 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -35,7 +35,7 @@
<td>
<f:if condition="{mail.sent} == '0'">
<f:then>
- <f:link.action class="btn btn-default btn-send-now" controller="Queue" action="sendMail" arguments="{uid: mail.uid}">
+ <f:link.action class="btn btn-default btn-send-now" controller="Queue" action="sendMail" arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
<span class="t3js-icon icon icon-size-small icon-state-default actions-document-import-t3d">
<span class="icon-markup">
<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-document-import-t3d.svg" width="16" height="16">
@@ -45,7 +45,7 @@
</f:link.action>
</f:then>
<f:else>
- <f:link.action class="btn btn-default btn-resend" controller="Queue" action="sendMail" arguments="{uid: mail.uid}">
+ <f:link.action class="btn btn-default btn-resend" controller="Queue" action="sendMail" arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-insert-reference">
<span class="icon-markup">
<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-insert-reference.svg" width="16" height="16">
--
GitLab