mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-03 13:44:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4642 from b2cc/bugfix-4518-unable-to-view-reports-in-admin

Browse source 
[Bugfix] #4518: SQL query that generates the report list in the admin view needs to include the 'id' field
This commit is contained in:
daniel 2023-09-09 20:48:18 -06:00 committed by GitHub
commit c4843e823e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Admin/AdminReportController.php
View file

@ -643,7 +643,7 @@ trait AdminReportController
$q->whereNull('admin_seen') : $q->whereNull('admin_seen') :
$q->whereNotNull('admin_seen'); $q->whereNotNull('admin_seen');
}) })
->groupBy(['object_id', 'object_type']) ->groupBy(['id', 'object_id', 'object_type'])
->cursorPaginate(6) ->cursorPaginate(6)
->withQueryString() ->withQueryString()
); );

2
app/Http/Controllers/ComposeController.php
View file

@ -415,7 +415,7 @@ class ComposeController extends Controller
$results = Profile::select('id','domain','username') $results = Profile::select('id','domain','username')
->whereNotIn('id', $blocked) ->whereNotIn('id', $blocked)
->where('username','like','%'.$q.'%') ->where('username','like','%'.$q.'%')
->groupBy('domain') ->groupBy('id', 'domain')
->limit(15) ->limit(15)
->get() ->get()
->map(function($profile) { ->map(function($profile) {