From 808bc5201d27f17e89e62998c8ffc3951405b0df Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 13 Aug 2015 23:02:33 +0100 Subject: [PATCH 1/3] 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 !!} From 0bff2f9215d1b1e048d6185df3590bfde5f5c8d7 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 14 Aug 2015 08:47:28 +0100 Subject: [PATCH 2/3] Don't pass through the whole incident name, just the components --- app/Handlers/Events/SendIncidentEmailNotificationHandler.php | 2 +- resources/views/emails/incidents/new-html.blade.php | 2 +- resources/views/emails/incidents/new-text.blade.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php index 284d2d61..7778a4ab 100644 --- a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php +++ b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php @@ -69,7 +69,7 @@ class SendIncidentEmailNotificationHandler $mail = [ 'email' => $subscriber->email, 'subject' => 'New incident reported.', - 'incident' => $event->incident, + 'component_name' => $event->incident->component->name, '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 eeda7ad2..22442398 100644 --- a/resources/views/emails/incidents/new-html.blade.php +++ b/resources/views/emails/incidents/new-html.blade.php @@ -9,7 +9,7 @@

{!! $status !!} - @if($incident->component) + @if(isset($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 3d6d590f..9f72908a 100644 --- a/resources/views/emails/incidents/new-text.blade.php +++ b/resources/views/emails/incidents/new-text.blade.php @@ -1,8 +1,8 @@ {!! trans('cachet.subscriber.email.incident.text', ['app_name' => Setting::get('app_name')]) !!} {!! $status !!} -@if($incident->component) -({{ $incident->component->name }}) +@if($component_name) +({{ $component_name }}) @endif {!! $textContent !!} From 1b953038be87ff5dda6c6bf42a9a12582bdd7153 Mon Sep 17 00:00:00 2001 From: Joseph Cohen Date: Fri, 14 Aug 2015 21:32:19 -0500 Subject: [PATCH 3/3] Decorate component --- .../Events/SendIncidentEmailNotificationHandler.php | 12 +++++++----- resources/views/emails/incidents/new-html.blade.php | 4 ++-- resources/views/emails/incidents/new-text.blade.php | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php index 7778a4ab..7000a8cc 100644 --- a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php +++ b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php @@ -61,7 +61,8 @@ class SendIncidentEmailNotificationHandler */ public function handle(IncidentHasReportedEvent $event) { - $data = $this->presenter->decorate($event->incident); + $incident = $this->presenter->decorate($event->incident); + $component = $this->presenter->decorate($event->incident->component); // Only send emails for public incidents. if ($event->incident->visible === 1) { @@ -69,10 +70,11 @@ class SendIncidentEmailNotificationHandler $mail = [ 'email' => $subscriber->email, 'subject' => 'New incident reported.', - 'component_name' => $event->incident->component->name, - 'status' => $data->humanStatus, - 'htmlContent' => $data->formattedMessage, - 'textContent' => $data->message, + 'hasComponent' => ($event->incident->component) ? true : false, + 'componentName' => $component->name, + 'status' => $incident->humanStatus, + 'htmlContent' => $incident->formattedMessage, + 'textContent' => $incident->message, 'token' => $subscriber->token, 'unsubscribeLink' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]), 'appUrl' => env('APP_URL'), diff --git a/resources/views/emails/incidents/new-html.blade.php b/resources/views/emails/incidents/new-html.blade.php index 22442398..d52433f8 100644 --- a/resources/views/emails/incidents/new-html.blade.php +++ b/resources/views/emails/incidents/new-html.blade.php @@ -9,8 +9,8 @@

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

diff --git a/resources/views/emails/incidents/new-text.blade.php b/resources/views/emails/incidents/new-text.blade.php index 9f72908a..07334962 100644 --- a/resources/views/emails/incidents/new-text.blade.php +++ b/resources/views/emails/incidents/new-text.blade.php @@ -1,8 +1,8 @@ {!! trans('cachet.subscriber.email.incident.text', ['app_name' => Setting::get('app_name')]) !!} {!! $status !!} -@if($component_name) -({{ $component_name }}) +@if($hasComponent) +({{ $componentName }}) @endif {!! $textContent !!}