Skip to content

Commit 0544e44

Browse files
committed
Fix entries count
1 parent 91b22dd commit 0544e44

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

src/Http/Controllers/CP/Collections/CollectionsController.php

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,25 @@ private function collections()
5555
|| User::current()->can('view', $collection)
5656
&& $collection->sites()->contains(Site::selected()->handle());
5757
})->map(function ($collection) {
58+
$entriesCount = $collection->queryEntries()
59+
->where('site', Site::selected())
60+
->when(User::current()->cant('view-other-authors-entries', [EntryContract::class, $collection]), function ($query) use ($collection) {
61+
$blueprintsWithoutAuthor = $collection->entryBlueprints()
62+
->filter(fn ($blueprint) => ! $blueprint->hasField('author'))
63+
->map->handle()->all();
64+
65+
$query->where(function ($query) use ($blueprintsWithoutAuthor) {
66+
$query
67+
->whereIn('blueprint', $blueprintsWithoutAuthor)
68+
->orWhere('author', User::current()->id());
69+
});
70+
})
71+
->count();
72+
5873
return [
5974
'id' => $collection->handle(),
6075
'title' => $collection->title(),
61-
'entries' => $collection->queryEntries()->where('site', Site::selected())->count(),
76+
'entries' => $entriesCount,
6277
'edit_url' => $collection->editUrl(),
6378
'delete_url' => $collection->deleteUrl(),
6479
'entries_url' => cp_route('collections.show', $collection->handle()),

0 commit comments

Comments
 (0)