Merge pull request #646 from cachethq/incident-format-presenter

Fixes #644 - Incident presenter respects the date format.
2015-05-19 20:17:41 +01:00
parent d9b5c31a06 f2e869f610
commit 1aedce0219
3 changed files with 28 additions and 15 deletions
@@ -38,6 +38,7 @@ class IncidentPresenter extends BasePresenter
        parent::__construct($resource);

        $this->tz = Setting::get('app_timezone');
+        $this->format = Setting::get('incident_date_format') ?: 'l jS F Y H:i:s';
    }

    /**
@@ -71,7 +72,7 @@ class IncidentPresenter extends BasePresenter
    {
        return ucfirst((new Date($this->wrappedObject->created_at))
            ->setTimezone($this->tz)
-            ->format('l jS F Y H:i:s'));
+            ->format($this->format));
    }

    /**
@@ -115,7 +116,7 @@ class IncidentPresenter extends BasePresenter
    {
        return ucfirst((new Date($this->wrappedObject->scheduled_at))
            ->setTimezone($this->tz)
-            ->format('l jS F Y H:i:s'));
+            ->format($this->format));
    }

    /**