webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Updated shelf-list view to enforce view permissions for child books

Browse Source 
- Aligned shelf-homepage behaviour to match
- Updated testing to cover.

For #2111
This commit is contained in:
Dan Brown
2020-05-12 22:21:45 +01:00
parent d3ec38bee3
commit 9666c8c0f7
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Entities/Repos/BookshelfRepo.php
View File

@ -28,8 +28,10 @@ class BookshelfRepo
*/
public function getAllPaginated(int $count = 20, string $sort = 'name', string $order = 'asc'): LengthAwarePaginator
{
return Bookshelf::visible()->with('visibleBooks')
->orderBy($sort, $order)->paginate($count);
return Bookshelf::visible()
->with('visibleBooks')
->orderBy($sort, $order)
->paginate($count);
}
/**

4
app/Http/Controllers/HomeController.php
View File

@ -69,11 +69,7 @@ class HomeController extends Controller
}
if ($homepageOption === 'bookshelves') {
$shelfRepo = app(BookshelfRepo::class);
$shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['sort'], $commonData['order']);
foreach ($shelves as $shelf) {
$shelf->books = $shelf->visibleBooks;
}
$data = array_merge($commonData, ['shelves' => $shelves]);
return view('common.home-shelves', $data);
}