lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for notify setting. Also close #741 (send notification via API)

Browse Source
This commit is contained in:
James Brooks
2015-06-18 16:24:10 +01:00
parent 44109dd9fb
commit f52f5a1c80
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Admin/IncidentController.php
View File

@@ -158,7 +158,12 @@ class IncidentController extends AbstractController
trans('dashboard.incidents.add.success')
);
if (array_get($incidentData, 'notify')) {
$isEnabled = (bool) Setting::get('enable_subscribers', false);
$mailAddress = env('MAIL_ADDRESS', false);
$mailFrom = env('MAIL_NAME', false);
$subscribersEnabled = $isEnabled && $mailAddress && $mailFrom;
if (array_get($incidentData, 'notify') && $subscribersEnabled) {
event(new IncidentHasReportedEvent($incident));
}

7
app/Http/Controllers/Admin/ScheduleController.php
View File

@@ -138,7 +138,12 @@ class ScheduleController extends AbstractController
trans('dashboard.schedule.add.success')
);
if (array_get($scheduleData, 'notify')) {
$isEnabled = (bool) Setting::get('enable_subscribers', false);
$mailAddress = env('MAIL_ADDRESS', false);
$mailFrom = env('MAIL_NAME', false);
$subscribersEnabled = $isEnabled && $mailAddress && $mailFrom;
if (array_get($scheduleData, 'notify') && $subscribersEnabled) {
event(new MaintenanceHasScheduledEvent($incident));
}

11
app/Http/Controllers/Api/IncidentController.php
View File

@@ -11,6 +11,8 @@
namespace CachetHQ\Cachet\Http\Controllers\Api;
use CachetHQ\Cachet\Events\IncidentHasReportedEvent;
use CachetHQ\Cachet\Facades\Setting;
use CachetHQ\Cachet\Models\Incident;
use Exception;
use GrahamCampbell\Binput\Facades\Binput;
@@ -67,6 +69,15 @@ class IncidentController extends AbstractApiController
throw new BadRequestHttpException();
}
$isEnabled = (bool) Setting::get('enable_subscribers', false);
$mailAddress = env('MAIL_ADDRESS', false);
$mailFrom = env('MAIL_NAME', false);
$subscribersEnabled = $isEnabled && $mailAddress && $mailFrom;
if (array_get($incidentData, 'notify') && $subscribersEnabled) {
event(new IncidentHasReportedEvent($incident));
}
if ($incident->isValid()) {
return $this->item($incident);
}