mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 13:38:20 +01:00
Code Issues Projects Releases Wiki Activity

Rename formattedMessage into snake_case for consistency

Browse Source
This commit is contained in:
James Brooks 2016-11-25 20:34:58 +00:00
parent 0af195af86
commit 72056e2ac5
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
View File

@ -116,7 +116,7 @@ class SendIncidentEmailNotificationHandler
'name' => $incident->name, 'name' => $incident->name,
'timestamp' => $incident->occurred_at_formatted, 'timestamp' => $incident->occurred_at_formatted,
'status' => $incident->human_status, 'status' => $incident->human_status,
'html_content' => $incident->formattedMessage, 'html_content' => $incident->formatted_message,
'text_content' => $incident->message, 'text_content' => $incident->message,
'token' => $subscriber->token, 'token' => $subscriber->token,
'manage_link' => cachet_route('subscribe.manage', [$subscriber->verify_code]), 'manage_link' => cachet_route('subscribe.manage', [$subscriber->verify_code]),

2
app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php
View File

@ -105,7 +105,7 @@ class SendScheduleEmailNotificationHandler
'name' => $incident->name, 'name' => $incident->name,
'timestamp' => $incident->scheduled_at_formatted, 'timestamp' => $incident->scheduled_at_formatted,
'status' => $incident->human_status, 'status' => $incident->human_status,
'html_content' => $incident->formattedMessage, 'html_content' => $incident->formatted_message,
'text_content' => $incident->message, 'text_content' => $incident->message,
'token' => $subscriber->token, 'token' => $subscriber->token,
'manage_link' => cachet_route('subscribe.manage', [$subscriber->verify_code]), 'manage_link' => cachet_route('subscribe.manage', [$subscriber->verify_code]),

4
app/Presenters/IncidentPresenter.php
View File

@ -62,7 +62,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable
* *
* @return string * @return string
*/ */
public function formattedMessage() public function formatted_message()
{ {
return Markdown::convertToHtml($this->wrappedObject->message); return Markdown::convertToHtml($this->wrappedObject->message);
} }
@ -74,7 +74,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable
*/ */
public function raw_message() public function raw_message()
{ {
return strip_tags($this->formattedMessage()); return strip_tags($this->formatted_message());
} }
/** /**

4
app/Presenters/IncidentUpdatePresenter.php
View File

@ -32,7 +32,7 @@ class IncidentUpdatePresenter extends BasePresenter implements Arrayable
* *
* @return string * @return string
*/ */
public function formattedMessage() public function formatted_message()
{ {
return Markdown::convertToHtml($this->wrappedObject->message); return Markdown::convertToHtml($this->wrappedObject->message);
} }
@ -44,7 +44,7 @@ class IncidentUpdatePresenter extends BasePresenter implements Arrayable
*/ */
public function raw_message() public function raw_message()
{ {
return strip_tags($this->formattedMessage()); return strip_tags($this->formatted_message());
} }
/** /**

2
app/Presenters/SchedulePresenter.php
View File

@ -54,7 +54,7 @@ class SchedulePresenter extends BasePresenter implements Arrayable
* *
* @return string * @return string
*/ */
public function formattedMessage() public function formatted_message()
{ {
return Markdown::convertToHtml($this->wrappedObject->message); return Markdown::convertToHtml($this->wrappedObject->message);
} }

2
resources/views/partials/incident.blade.php
View File

@ -20,7 +20,7 @@
</small> </small>
</div> </div>
<div class="panel-body markdown-body"> <div class="panel-body markdown-body">
{!! $incident->formattedMessage !!} {!! $incident->formatted_message !!}
</div> </div>
@if($incident->updates->count()) @if($incident->updates->count())
<div class="list-group"> <div class="list-group">

2
resources/views/partials/schedule.blade.php
View File

@ -7,7 +7,7 @@
@foreach($scheduled_maintenance as $schedule) @foreach($scheduled_maintenance as $schedule)
<a href="{{ cachet_route('schedule', $schedule) }}" class="list-group-item"> <a href="{{ cachet_route('schedule', $schedule) }}" class="list-group-item">
<strong>{{ $schedule->name }}</strong> <small class="date"><abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $schedule->scheduled_at_formatted }}" data-timeago="{{ $schedule->scheduled_at_iso }}"></abbr></small> <strong>{{ $schedule->name }}</strong> <small class="date"><abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $schedule->scheduled_at_formatted }}" data-timeago="{{ $schedule->scheduled_at_iso }}"></abbr></small>
{!! $schedule->formattedMessage !!} {!! $schedule->formatted_message !!}
@if($schedule->components->count() > 0) @if($schedule->components->count() > 0)
<hr> <hr>
@foreach($schedule->components as $affected_component) @foreach($schedule->components as $affected_component)

4
resources/views/single-incident.blade.php
View File

@ -12,7 +12,7 @@
<hr> <hr>
<div class="markdown-body"> <div class="markdown-body">
{!! $incident->formattedMessage !!} {!! $incident->formatted_message !!}
</div> </div>
@if($incident->updates) @if($incident->updates)
@ -30,7 +30,7 @@
<div class="panel panel-message incident"> <div class="panel panel-message incident">
<div class="panel-body"> <div class="panel-body">
<div class="markdown-body"> <div class="markdown-body">
{!! $update->formattedMessage !!} {!! $update->formatted_message !!}
</div> </div>
</div> </div>
<div class="panel-footer"><small>{{ trans('cachet.incidents.posted', ['timestamp' => $update->created_at_diff]) }}</small></div> <div class="panel-footer"><small>{{ trans('cachet.incidents.posted', ['timestamp' => $update->created_at_diff]) }}</small></div>

2
resources/views/single-schedule.blade.php
View File

@ -24,7 +24,7 @@
<strong>{{ $schedule->name }}</strong>{{ trans("cachet.incidents.scheduled_at", ["timestamp" => $schedule->scheduled_at_diff]) }} <strong>{{ $schedule->name }}</strong>{{ trans("cachet.incidents.scheduled_at", ["timestamp" => $schedule->scheduled_at_diff]) }}
</div> </div>
<div class="panel-body"> <div class="panel-body">
{!! $schedule->formattedMessage !!} {!! $schedule->formatted_message !!}
</div> </div>
</div> </div>
</div> </div>