X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/c429cf78187e80deb63982a282a1c6889f30291a..refs/pull/3693/head:/app/Http/Controllers/FavouriteController.php diff --git a/app/Http/Controllers/FavouriteController.php b/app/Http/Controllers/FavouriteController.php index a990ff825..f77b04843 100644 --- a/app/Http/Controllers/FavouriteController.php +++ b/app/Http/Controllers/FavouriteController.php @@ -21,6 +21,8 @@ class FavouriteController extends Controller $hasMoreLink = ($favourites->count() > $viewCount) ? url('/http/source.bookstackapp.com/favourites?page=' . ($page + 1)) : null; + $this->setPageTitle(trans('entities.my_favourites')); + return view('common.detailed-listing-with-more', [ 'title' => trans('entities.my_favourites'), 'entities' => $favourites->slice(0, $viewCount), @@ -66,11 +68,11 @@ class FavouriteController extends Controller * @throws \Illuminate\Validation\ValidationException * @throws \Exception */ - protected function getValidatedModelFromRequest(Request $request): Favouritable + protected function getValidatedModelFromRequest(Request $request): Entity { $modelInfo = $this->validate($request, [ - 'type' => 'required|string', - 'id' => 'required|integer', + 'type' => ['required', 'string'], + 'id' => ['required', 'integer'], ]); if (!class_exists($modelInfo['type'])) { @@ -85,7 +87,7 @@ class FavouriteController extends Controller $modelInstance = $model->newQuery() ->where('id', '=', $modelInfo['id']) - ->first(['id', 'name']); + ->first(['id', 'name', 'restricted', 'owned_by']); $inaccessibleEntity = ($modelInstance instanceof Entity && !userCan('view', $modelInstance)); if (is_null($modelInstance) || $inaccessibleEntity) {