diff --git a/skolehjem/app/Http/Controllers/RootController.php b/skolehjem/app/Http/Controllers/RootController.php index e985197..79f6419 100644 --- a/skolehjem/app/Http/Controllers/RootController.php +++ b/skolehjem/app/Http/Controllers/RootController.php @@ -32,12 +32,12 @@ class RootController extends Controller return view("admin.root.index"); else { - $news = News::query()->orderBy('id', 'desc')->paginate($perPage); + $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('id', 'desc')->paginate($perPage); return view("app.root.index", ["news" => $news]); } } else { - $news = News::query()->orderBy('id', 'desc')->paginate($perPage, ['*'], "page"); + $news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('id', 'desc')->paginate($perPage, ['*'], "page"); return Response::detect('root.index', ["news" => $news]); } diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index 09bdd50..80f9422 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -47,13 +47,13 @@ @endif