Merge branch '1.2'

Conflicts: composer.lock resources/views/partials/incidents.blade.php
2015-09-04 11:53:25 +01:00
parent 99cd275a9d 1ac4b7a64a
commit d20ee2987b
6 changed files with 40 additions and 6 deletions
--- a/app/Models/Incident.php
+++ b/app/Models/Incident.php
@@ -142,7 +142,7 @@ class Incident extends Model implements HasPresenter
     */
    public function getIsScheduledAttribute()
    {
-        return $this->getOriginal('scheduled_at');
+        return $this->getOriginal('scheduled_at') !== null;
    }

    /**