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
- @if ($new->type_id == 1 || $new->type_id == 2) {{-- If it's a news or menu then display the whole message --}} + @if ($new->type == 'News' || $new->type == 'Menu') {{-- If it's a news or menu then display the whole message --}} {!! $new->content !!} @else {{-- If it's a menu, guide or event. Then display up to 300 characters of text --}} {!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!} @endif - @if ($new->type_id == 3) {{-- If it's displaying an event, then show `Tilmeld`, `Læs mere` & `Se deltagere` --}} + @if ($new->type == 'Activity') {{-- If it's displaying an event, then show `Tilmeld`, `Læs mere` & `Se deltagere` --}}
@if (count(\App\UserEvent::query()->where('event_id', '=', $new->arrangement_id)->where('user_id', '=', Auth::user()->id)->get()) > 0) {{__('msg.afmeld')}} @@ -63,7 +63,7 @@ $new->arrangement_id ])}}">{{__('msg.læsmere')}} $new->arrangement_id ])}}">{{__('msg.sedeltagere')}}
- @elseif ($new->type_id == 4) {{-- Else if's displaying guides, then show `Læs mere` --}} + @elseif ($new->type == 'Guide') {{-- Else if's displaying guides, then show `Læs mere` --}}
$new->arrangement_id])}}" class="sde-blue">{{__('msg.læsmere')}}