Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

Conflicts: skolehjem/app/Http/Controllers/RootController.php
2020-08-31 14:29:24 +02:00
parent 20aa9c52af bccd00683f
commit efb2840ff0
38 changed files with 323 additions and 214 deletions
@@ -2,6 +2,7 @@

 namespace App\Http\Controllers;

+use App\Event;
 use App\News;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -17,6 +18,15 @@ 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");