From 885c17054fcf80f6f8f91022ee53591c35c91979 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 18 Aug 2015 21:27:09 +0100 Subject: [PATCH] Allow setting of 0 incident days. Closes #920 --- app/Http/Controllers/StatusPageController.php | 10 ++++++++-- resources/views/dashboard/settings/app-setup.blade.php | 2 +- resources/views/index.blade.php | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/StatusPageController.php b/app/Http/Controllers/StatusPageController.php index 42690c8d..ac52d4e6 100644 --- a/app/Http/Controllers/StatusPageController.php +++ b/app/Http/Controllers/StatusPageController.php @@ -48,8 +48,13 @@ class StatusPageController extends Controller } } - $daysToShow = Setting::get('app_incident_days') ?: 7; - $incidentDays = range(0, $daysToShow - 1); + $daysToShow = Setting::get('app_incident_days', 0) - 1; + if ($daysToShow < 0) { + $daysToShow = 0; + $incidentDays = []; + } else { + $incidentDays = range(0, $daysToShow); + } $dateTimeZone = Setting::get('app_timezone'); $incidentVisiblity = Auth::check() ? 0 : 1; @@ -77,6 +82,7 @@ class StatusPageController extends Controller }, SORT_REGULAR, true)->all(); return View::make('index') + ->withDaysToShow($daysToShow) ->withAllIncidents($allIncidents) ->withAboutApp(Markdown::convertToHtml(Setting::get('app_about'))) ->withCanPageForward((bool) $today->gt($startDate)) diff --git a/resources/views/dashboard/settings/app-setup.blade.php b/resources/views/dashboard/settings/app-setup.blade.php index 65262ddd..414bd320 100644 --- a/resources/views/dashboard/settings/app-setup.blade.php +++ b/resources/views/dashboard/settings/app-setup.blade.php @@ -135,7 +135,7 @@
- +
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 7fd3d761..2ba65ae7 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -55,6 +55,7 @@ @endif + @if($days_to_show > 0)

{{ trans('cachet.incidents.past') }}

@foreach($all_incidents as $date => $incidents) @@ -80,4 +81,5 @@ @endif + @endif @stop