Backport Incident Updates from v3.0.0

2016-10-06 17:21:18 +01:00
parent c778ce91c3
commit c94919f1b9
43 changed files with 1834 additions and 85 deletions
--- a/app/Integrations/Core/System.php
+++ b/app/Integrations/Core/System.php
@@ -53,8 +53,11 @@ class System implements SystemContract
                return $incident->status > 0;
            });
            $incidentCount = $incidents->count();
+            $unresolvedCount = $incidents->filter(function ($incident) {
+                return !$incident->is_resolved;
+            })->count();

-            if ($incidentCount === 0 || ($incidentCount >= 1 && (int) $incidents->first()->status === 4)) {
+            if ($incidentCount === 0 || ($incidentCount >= 1 && $unresolvedCount === 0)) {
                $status = [
                    'system_status'  => 'success',
                    'system_message' => trans_choice('cachet.service.good', $totalComponents),