v0.10.18a - Various fixes

skolehjem/app/Http/Controllers/EventController.php

@@ -32,12 +32,17 @@ class EventController extends Controller
      */
     public function index(Request $request)
     {
-        DB::table('user_events')
-            ->where('event_id')
-            ->delete();
-        DB::table('events')
-            ->where('events.date', '<=', date('Y-m-d H:i', strtotime('-1 day')))
-            ->delete();
+        $eventsToDelete = DB::table('events')
+            ->where('events.date', '<=', date('Y-m-d H:i', strtotime('-1 day')))->get();
+
+        foreach ($eventsToDelete as $event)
+        {
+            DB::table('user_events')
+                ->where('event_id', '=', $event->id)
+                ->delete();
+
+            $event->delete();
+        }
 
         $events = Event::query()->orderBY('date' , 'asc')->paginate($request->input("limit", 20));
 
@@ -61,7 +66,7 @@ class EventController extends Controller
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function store(Request $request)
     {
@@ -102,7 +107,6 @@ class EventController extends Controller
 
             return redirect()->route('events.index', ['events' => $events]);
         }
-
     }
 
     /**

skolehjem/app/Http/Controllers/NewsController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Event;
 use App\Helpers;
 use App\News;
 use App\User;

skolehjem/app/Http/Controllers/RootController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Event;
 use App\News;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -17,10 +18,20 @@ class RootController extends Controller
     public function index() {
         $perPage = 5;
 
+        $newsCollection = News::query()->orderBy('id', 'desc')->paginate($perPage);
+
+        foreach ($newsCollection as $new)
+        {
+            if($new->type_id == 3)
+                if(Event::query()->where('id', '=', $new->arrangement_id)->first() == null)
+                    $new->delete();
+        }
+
         if(auth()->user()->can('admin.panel.show')) {
             if(Response::detect("root.index")->name() == "admin.root.index")
                 return view("admin.root.index");
             else {
+
                 $news = News::query()->orderBy('id', 'desc')->paginate($perPage);
                 return view("app.root.index", ["news" => $news]);
             }