mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-18 05:58:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #903 from cachethq/schedule-incident-times

Browse Source 
Show the scheduled time if applicable. Closes #799
This commit is contained in:
James Brooks 2015-08-14 08:29:50 +01:00
commit ee0899f5c3
6 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Handlers/Events/SendMaintenanceEmailNotificationHandler.php
View File

@ -70,6 +70,7 @@ class SendMaintenanceEmailNotificationHandler
'status' => $data->humanStatus,
'htmlContent' => $data->formattedMessage,
'textContent' => $data->message,
'scheduled_at' => $data->scheduled_at_formatted,
'token' => $subscriber->token,
'unsubscribeLink' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
'appUrl' => env('APP_URL'),

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

@ -109,7 +109,7 @@ class ScheduleController extends Controller
$scheduleData['status'] = 0;
try {
Incident::create($scheduleData);
$incident = Incident::create($scheduleData);
} catch (ValidationException $e) {
return Redirect::route('dashboard.schedule.add')
->withInput(Binput::all())

2
app/Presenters/IncidentPresenter.php
View File

@ -160,7 +160,7 @@ class IncidentPresenter extends AbstractPresenter
public function toArray()
{
return array_merge($this->wrappedObject->toArray(), [
'scheduled_at' => $this->created_at(),
'scheduled_at' => $this->scheduled_at(),
'created_at' => $this->created_at(),
'updated_at' => $this->updated_at(),
]);

11
app/Presenters/Traits/TimestampsTrait.php
View File

@ -26,6 +26,17 @@ trait TimestampsTrait
->setTimezone($this->setting->get('app_timezone'))->toDateTimeString();
}
/**
* Present formatted date time.
*
* @return string
*/
public function scheduled_at()
{
return (new Date($this->wrappedObject->scheduled_at))
->setTimezone($this->setting->get('app_timezone'))->toDateTimeString();
}
/**
* Present formatted date time.
*

2
resources/views/emails/incidents/maintenance-html.blade.php
View File

@ -7,6 +7,8 @@
@section('content')
{!! trans('cachet.subscriber.email.maintenance.html', ['app_name' => Setting::get('app_name')]) !!}
<p>{{ $scheduled_at }}</p>
<p>
{!! $status !!}
</p>

2
resources/views/emails/incidents/maintenance-text.blade.php
View File

@ -1,5 +1,7 @@
{!! trans('cachet.subscriber.email.maintenance.text', ['app_name' => Setting::get('app_name')]) !!}
{{ $scheduled_at }}
{!! $status !!}
{!! $textContent !!}