Skip to content
Snippets Groups Projects
Commit 74088fa3 authored by Stefan Galinski's avatar Stefan Galinski :video_game:
Browse files

[BUGFIX] Wrong rendering of the dates in the mail queue

parent adaefc17
No related branches found
No related tags found
1 merge request!3New version 4 1
......@@ -143,12 +143,12 @@ class MailRepository extends AbstractRepository {
$fromTime = strtotime($filters['filterFromDate']);
if ($fromTime) {
$constraintsAnd[] = $query->greaterThan('last_sending_time', $fromTime);
$constraintsAnd[] = $query->greaterThanOrEqual('last_sending_time', $fromTime);
}
$toTime = strtotime($filters['filterToDate']);
if ($toTime) {
$constraintsAnd[] = $query->lessThan('last_sending_time', $toTime);
$constraintsAnd[] = $query->lessThanOrEqual('last_sending_time', $toTime);
}
if ($filters['sent']) {
......
......@@ -50,10 +50,10 @@
<span><f:format.crop maxCharacters="40" append="...">{mail.mail_subject}</f:format.crop></span>
</td>
<td>
<span><f:format.date format="d.m.Y h:i">{mail.crdate}</f:format.date></span>
<span><f:format.date format="d.m.Y H:i">{mail.crdate}</f:format.date></span>
<br>
<f:if condition="{mail.last_sending_time} != 0">
<span><f:format.date format="d.m.Y h:i">{mail.last_sending_time}</f:format.date></span>
<span><f:format.date format="d.m.Y H:i">{mail.last_sending_time}</f:format.date></span>
</f:if>
</td>
<td nowrap="nowrap" class="col-control">
......
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