vict3459/Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	skolehjem/app/Http/Controllers/RootController.php
#	skolehjem/resources/views/app/news/index.blade.php
This commit is contained in:
Anders
2020-08-31 14:35:03 +02:00
parent cf1baac983 efb2840ff0
commit 9b26e5f1af
3 changed files with 136 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/app/Http/Controllers/RootController.php
+2 -3
View File
@@ -31,13 +31,12 @@ class RootController extends Controller
if(Response::detect("root.index")->name() == "admin.root.index")
return view("admin.root.index");
else {
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('id', 'desc')->paginate($perPage);
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('id', 'desc')->get();
return view("app.root.index", ["news" => $news]);
}
}
else {
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('id', 'desc')->paginate($perPage, ['*'], "page");
$news = News::query()->join('news_types', 'news_types.id', '=', 'news.type_id')->orderBy('id', 'desc')->get();
return Response::detect('root.index', ["news" => $news]);
}