yetangitu/pixelfed
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update admin reports, fix 404 bug

Browse source
This commit is contained in:
Daniel Supernault 2020-01-22 19:49:59 -07:00
parent 9fd72b5e54
commit dbd5c4cf77
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 71 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/Http/Controllers/AdminController.php
View file

@ -142,21 +142,17 @@ class AdminController extends Controller
public function reports(Request $request)
{
$this->validate($request, [
'filter' => 'nullable|string|in:all,open,closed'
]);
$filter = $request->input('filter');
if(in_array($filter, ['open', 'closed'])) {
if($filter == 'open') {
$reports = Report::orderBy('created_at','desc')
->whereNotNull('admin_seen')
->paginate(10);
} else {
$reports = Report::orderBy('created_at','desc')
->whereNull('admin_seen')
->paginate(10);
}
} else {
$reports = Report::orderBy('created_at','desc')
->paginate(10);
}
$reports = Report::orderBy('created_at','desc')
->when($filter, function($q, $filter) {
return $filter == 'open' ?
$q->whereNull('admin_seen') :
$q->whereNotNull('admin_seen');
})
->paginate(4);
return view('admin.reports.home', compact('reports'));
}