|
278 | 278 | {% for event in collector.events.events(transport) %} |
279 | 279 | <tr class="mailer-email-summary-table-row {{ loop.first ? 'active' }}" data-target="#email-{{ loop.index }}"> |
280 | 280 | <td>{{ loop.index }}</td> |
281 | | - <td> |
282 | | - {% if event.message.subject is defined %} |
283 | | - {{ event.message.getSubject() ?? '(No subject)' }} |
284 | | - {% elseif event.message.headers.has('subject') %} |
285 | | - {{ event.message.headers.get('subject').bodyAsString()|default('(No subject)') }} |
286 | | - {% else %} |
287 | | - (No subject) |
288 | | - {% endif %} |
289 | | - </td> |
290 | | - <td> |
291 | | - {% if event.message.to is defined %} |
292 | | - {{ event.message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }} |
293 | | - {% elseif event.message.headers.has('to') %} |
294 | | - {{ event.message.headers.get('to').bodyAsString()|default('(empty)') }} |
295 | | - {% else %} |
296 | | - (empty) |
297 | | - {% endif %} |
298 | | - </td> |
| 281 | + <td>{{ event.message.headers.get('subject').bodyAsString()|default('(No subject)') }}</td> |
| 282 | + <td>{{ event.message.headers.get('to').bodyAsString()|default(event.envelope.recipients|map(addr => addr.toString())|join(', ')) }}</td> |
299 | 283 | <td class="visually-hidden"><button class="mailer-email-summary-table-row-button" data-target="#email-{{ loop.index }}">View email details</button></td> |
300 | 284 | </tr> |
301 | 285 | {% endfor %} |
|
339 | 323 | <div class="tab-content"> |
340 | 324 | <div class="card-block"> |
341 | 325 | <p class="mailer-message-subject"> |
342 | | - {% if message.subject is defined %} |
343 | | - {{ message.getSubject() ?? '(No subject)' }} |
344 | | - {% elseif message.headers.has('subject') %} |
345 | | - {{ message.headers.get('subject').bodyAsString()|default('(No subject)') }} |
346 | | - {% else %} |
347 | | - (No subject) |
348 | | - {% endif %} |
| 326 | + {{ message.headers.get('subject').bodyAsString()|default('(No subject)') }} |
349 | 327 | </p> |
350 | 328 | <div class="mailer-message-headers"> |
351 | 329 | <p> |
352 | 330 | <strong>From:</strong> |
353 | | - {% if message.from is defined %} |
354 | | - {{ message.getFrom()|map(addr => addr.toString())|join(', ')|default('(empty)') }} |
355 | | - {% elseif message.headers.has('from') %} |
356 | | - {{ message.headers.get('from').bodyAsString()|default('(empty)') }} |
357 | | - {% else %} |
358 | | - (empty) |
359 | | - {% endif %} |
| 331 | + {{ message.headers.get('from').bodyAsString()|default('(empty)') }} |
360 | 332 | </p> |
361 | 333 | <p> |
362 | 334 | <strong>To:</strong> |
363 | | - {% if message.to is defined %} |
364 | | - {{ message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }} |
365 | | - {% elseif message.headers.has('to') %} |
366 | | - {{ message.headers.get('to').bodyAsString()|default('(empty)') }} |
367 | | - {% else %} |
368 | | - (empty) |
369 | | - {% endif %} |
| 335 | + {{ message.headers.get('to').bodyAsString()|default('(empty)') }} |
370 | 336 | </p> |
371 | 337 | {% for header in message.headers.all|filter(header => (header.name ?? '')|lower not in ['subject', 'from', 'to']) %} |
372 | 338 | <p class="mailer-message-header-secondary">{{ header.toString }}</p> |
|
0 commit comments