X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/40ca50e44f3ca0f648d915dc73ff205309730f07..refs/pull/3391/head:/app/Http/Controllers/FavouriteController.php diff --git a/app/Http/Controllers/FavouriteController.php b/app/Http/Controllers/FavouriteController.php index f4aeb4faa..b4cbdf5c2 100644 --- a/app/Http/Controllers/FavouriteController.php +++ b/app/Http/Controllers/FavouriteController.php @@ -17,13 +17,15 @@ class FavouriteController extends Controller { $viewCount = 20; $page = intval($request->get('page', 1)); - $favourites = (new TopFavourites)->run($viewCount + 1, (($page - 1) * $viewCount)); + $favourites = (new TopFavourites())->run($viewCount + 1, (($page - 1) * $viewCount)); - $hasMoreLink = ($favourites->count() > $viewCount) ? url("/https/source.bookstackapp.com/favourites?page=" . ($page+1)) : null; + $hasMoreLink = ($favourites->count() > $viewCount) ? url('/https/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), + 'title' => trans('entities.my_favourites'), + 'entities' => $favourites->slice(0, $viewCount), 'hasMoreLink' => $hasMoreLink, ]); } @@ -41,6 +43,7 @@ class FavouriteController extends Controller $this->showSuccessNotification(trans('activities.favourite_add_notification', [ 'name' => $favouritable->name, ])); + return redirect()->back(); } @@ -57,6 +60,7 @@ class FavouriteController extends Controller $this->showSuccessNotification(trans('activities.favourite_remove_notification', [ 'name' => $favouritable->name, ])); + return redirect()->back(); } @@ -64,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'])) { @@ -76,8 +80,8 @@ class FavouriteController extends Controller } /** @var Model $model */ - $model = new $modelInfo['type']; - if (! $model instanceof Favouritable) { + $model = new $modelInfo['type'](); + if (!$model instanceof Favouritable) { throw new \Exception('Model not favouritable'); }