From d96887f38058e037a217e5b92dc60b2252903c1a Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Fri, 10 Mar 2017 18:20:29 +0100
Subject: [PATCH] [TASK] Adding missing parameter to send again button/action
---
Classes/Controller/QueueController.php | 4 +++-
Resources/Private/Language/locallang.xlf | 2 +-
Resources/Private/Templates/Queue/Index.html | 6 +++---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Classes/Controller/QueueController.php b/Classes/Controller/QueueController.php
index 17216edf..a6ddd72f 100644
--- a/Classes/Controller/QueueController.php
+++ b/Classes/Controller/QueueController.php
@@ -90,8 +90,10 @@ class QueueController extends ActionController {
* send or resend a mail in the queue
*
* @param int $uid
+ * @param string $selectedExtension
+ * @param string $selectedTemplate
*/
- public function sendMailAction($uid) {
+ public function sendMailAction($uid, $selectedExtension, $selectedTemplate) {
$mailService = new MailTemplateService();
$mailService->sendMailFromQueue($uid);
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 5b41bc52..611a59c8 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -64,7 +64,7 @@
<source>No template was registered.</source>
</trans-unit>
<trans-unit id="backend.no_queue_entries">
- <source>There are no Entries in the Mail Queue for this Template.</source>
+ <source>There are no entries in the mail queue for this template.</source>
</trans-unit>
<trans-unit id="backend.not_sent">
<source>Not Sent</source>
diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index eb06ac79..e05f4c73 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -31,17 +31,17 @@
<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">
</span>
- </span>
+ </span>s
Send Now
</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