1
0
Эх сурвалжийг харах

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

[Bugfix] #4518: SQL query that generates the report list in the admin view needs to include the 'id' field
daniel 1 жил өмнө
parent
commit
c4843e823e

+ 1 - 1
app/Http/Controllers/Admin/AdminReportController.php

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

+ 1 - 1
app/Http/Controllers/ComposeController.php

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