From 67df17d9e1e5281a34a85c6e873b0be4565d89d6 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Sat, 3 Dec 2016 19:36:55 +0000 Subject: [PATCH] Use the TimestampsTrait for the formatted incident date --- app/Presenters/ComponentPresenter.php | 3 +-- app/Presenters/IncidentUpdatePresenter.php | 3 +-- app/Presenters/SubscriberPresenter.php | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php index 99fbbf5d..a8f304d1 100644 --- a/app/Presenters/ComponentPresenter.php +++ b/app/Presenters/ComponentPresenter.php @@ -14,7 +14,6 @@ namespace CachetHQ\Cachet\Presenters; use CachetHQ\Cachet\Dates\DateFactory; use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait; use Illuminate\Contracts\Support\Arrayable; -use Illuminate\Support\Facades\Config; use McCool\LaravelAutoPresenter\BasePresenter; class ComponentPresenter extends BasePresenter implements Arrayable @@ -69,7 +68,7 @@ class ComponentPresenter extends BasePresenter implements Arrayable */ public function updated_at_formatted() { - return ucfirst(app(DateFactory::class)->make($this->wrappedObject->updated_at)->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s'))); + return ucfirst(app(DateFactory::class)->make($this->wrappedObject->updated_at)->format($this->incidentDateFormat())); } /** diff --git a/app/Presenters/IncidentUpdatePresenter.php b/app/Presenters/IncidentUpdatePresenter.php index 12537f74..88029e42 100644 --- a/app/Presenters/IncidentUpdatePresenter.php +++ b/app/Presenters/IncidentUpdatePresenter.php @@ -15,7 +15,6 @@ use CachetHQ\Cachet\Dates\DateFactory; use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait; use GrahamCampbell\Markdown\Facades\Markdown; use Illuminate\Contracts\Support\Arrayable; -use Illuminate\Support\Facades\Config; use McCool\LaravelAutoPresenter\BasePresenter; /** @@ -64,7 +63,7 @@ class IncidentUpdatePresenter extends BasePresenter implements Arrayable */ public function created_at_formatted() { - return ucfirst(app(DateFactory::class)->make($this->wrappedObject->created_at)->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s'))); + return ucfirst(app(DateFactory::class)->make($this->wrappedObject->created_at)->format($this->incidentDateFormat())); } /** diff --git a/app/Presenters/SubscriberPresenter.php b/app/Presenters/SubscriberPresenter.php index 2da85041..72795b3a 100644 --- a/app/Presenters/SubscriberPresenter.php +++ b/app/Presenters/SubscriberPresenter.php @@ -14,7 +14,6 @@ namespace CachetHQ\Cachet\Presenters; use CachetHQ\Cachet\Dates\DateFactory; use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait; use Illuminate\Contracts\Support\Arrayable; -use Illuminate\Support\Facades\Config; use McCool\LaravelAutoPresenter\BasePresenter; class SubscriberPresenter extends BasePresenter implements Arrayable @@ -28,7 +27,7 @@ class SubscriberPresenter extends BasePresenter implements Arrayable */ public function verified_at() { - return ucfirst(app(DateFactory::class)->make($this->wrappedObject->verified_at)->format(Config::get('setting.incident_date_format', 'l jS F Y H:i:s'))); + return ucfirst(app(DateFactory::class)->make($this->wrappedObject->verified_at)->format($this->incidentDateFormat())); } /**