From 725b34f6bf8e0ccd88de2c48a39d50f25689d37e Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Tue, 25 Aug 2020 12:28:28 +0200 Subject: [PATCH] v0.10.15 - Fixed EventController.php deletion of old events --- skolehjem/app/Http/Controllers/EventController.php | 7 ++++++- skolehjem/resources/views/app/events/index.blade.php | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 27fe206..ed02a45 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -33,7 +33,12 @@ class EventController extends Controller */ public function index(Request $request) { - DB::table('events')->where('date', '<=', date('Y-m-d H:i', strtotime('-1 day')))->delete(); + DB::table('user_events') + ->where('event_id') + ->delete(); + DB::table('events') + ->where('events.date', '<=', date('Y-m-d H:i', strtotime('-1 day'))) + ->delete(); $events = Event::query()->orderBY('date' , 'asc')->paginate($request->input("limit", 20)); diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index 2fe138b..a0473a9 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -45,7 +45,6 @@ @endif - @if(!$events->isEmpty()) @foreach($events as $event)