From 808bc5201d27f17e89e62998c8ffc3951405b0df Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 13 Aug 2015 23:02:33 +0100 Subject: [PATCH] Add the component name to incident emails, if applicable. Closes #794 --- app/Handlers/Events/SendIncidentEmailNotificationHandler.php | 1 + resources/views/emails/incidents/new-html.blade.php | 3 +++ resources/views/emails/incidents/new-text.blade.php | 3 +++ 3 files changed, 7 insertions(+) diff --git a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php index 5902fc93..284d2d61 100644 --- a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php +++ b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php @@ -69,6 +69,7 @@ class SendIncidentEmailNotificationHandler $mail = [ 'email' => $subscriber->email, 'subject' => 'New incident reported.', + 'incident' => $event->incident, 'status' => $data->humanStatus, 'htmlContent' => $data->formattedMessage, 'textContent' => $data->message, diff --git a/resources/views/emails/incidents/new-html.blade.php b/resources/views/emails/incidents/new-html.blade.php index 88b0db7a..eeda7ad2 100644 --- a/resources/views/emails/incidents/new-html.blade.php +++ b/resources/views/emails/incidents/new-html.blade.php @@ -9,6 +9,9 @@

{!! $status !!} + @if($incident->component) + ({{ $incident->component->name }}) + @endif

diff --git a/resources/views/emails/incidents/new-text.blade.php b/resources/views/emails/incidents/new-text.blade.php index 4ce93f49..3d6d590f 100644 --- a/resources/views/emails/incidents/new-text.blade.php +++ b/resources/views/emails/incidents/new-text.blade.php @@ -1,6 +1,9 @@ {!! trans('cachet.subscriber.email.incident.text', ['app_name' => Setting::get('app_name')]) !!} {!! $status !!} +@if($incident->component) +({{ $incident->component->name }}) +@endif {!! $textContent !!}