lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #2759 - Days now generate when only 1

Browse Source
This commit is contained in:
James Brooks
2017-10-18 20:01:42 +01:00
parent 95d638f3f6
commit 11a5357ea9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/StatusPageController.php
View File

@@ -63,8 +63,8 @@ class StatusPageController extends AbstractApiController
}
}
$daysToShow = max(0, (int) Config::get('setting.app_incident_days', 0) - 1);
$incidentDays = range(0, $daysToShow);
$appIncidentDays = (int) Config::get('setting.app_incident_days', 1);
$incidentDays = array_pad([], $daysToShow, null);
$allIncidents = Incident::where('visible', '>=', (int) !Auth::check())->whereBetween('occurred_at', [
$startDate->copy()->subDays($daysToShow)->format('Y-m-d').' 00:00:00',
@@ -75,7 +75,7 @@ class StatusPageController extends AbstractApiController
// Add in days that have no incidents
if (Config::get('setting.only_disrupted_days') === false) {
foreach ($incidentDays as $i) {
foreach ($incidentDays as $i => $day) {
$date = app(DateFactory::class)->make($startDate)->subDays($i);
if (!isset($allIncidents[$date->toDateString()])) {