chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2660 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2021-02-15 21:07:51 -07:00 committed by GitHub
parent a0cfe87224 2ab73e1e96
commit 32a9afc7ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/AdminController.php
View File

@ -67,7 +67,10 @@ class AdminController extends Controller
public function reports(Request $request) public function reports(Request $request)
{ {
$filter = $request->input('filter') == 'closed' ? 'closed' : 'open'; $filter = $request->input('filter') == 'closed' ? 'closed' : 'open';
$reports = Report::orderBy('created_at','desc') $reports = Report::whereHas('status')
->whereHas('reportedUser')
->whereHas('reporter')
->orderBy('created_at','desc')
->when($filter, function($q, $filter) { ->when($filter, function($q, $filter) {
return $filter == 'open' ? return $filter == 'open' ?
$q->whereNull('admin_seen') : $q->whereNull('admin_seen') :

2
resources/views/admin/reports/home.blade.php
View File

@ -18,6 +18,7 @@
@php($ai = App\AccountInterstitial::whereNotNull('appeal_requested_at')->whereNull('appeal_handled_at')->count()) @php($ai = App\AccountInterstitial::whereNotNull('appeal_requested_at')->whereNull('appeal_handled_at')->count())
@php($spam = App\AccountInterstitial::whereType('post.autospam')->whereNull('appeal_handled_at')->count()) @php($spam = App\AccountInterstitial::whereType('post.autospam')->whereNull('appeal_handled_at')->count())
@if($ai || $spam) @if($ai || $spam)
<div class="col-12 col-md-8 offset-md-2">
<div class="mb-4"> <div class="mb-4">
<a class="btn btn-outline-primary px-5 py-3 mr-3" href="/i/admin/reports/appeals"> <a class="btn btn-outline-primary px-5 py-3 mr-3" href="/i/admin/reports/appeals">
<p class="font-weight-bold h4 mb-0">{{$ai}}</p> <p class="font-weight-bold h4 mb-0">{{$ai}}</p>
@ -28,6 +29,7 @@
Flagged {{$ai == 1 ? 'Post' : 'Posts'}} Flagged {{$ai == 1 ? 'Post' : 'Posts'}}
</a> </a>
</div> </div>
</div>
@endif @endif
@if($reports->count()) @if($reports->count())
<div class="col-12 col-md-8 offset-md-2"> <div class="col-12 col-md-8 offset-md-2">