X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/221a483b40d6e2860c4552812b0a9ec90dc8c008..refs/pull/1804/head:/app/Http/Controllers/SearchController.php diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 7fc618ea9..a5cd7ad6b 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -1,36 +1,35 @@ entityRepo = $entityRepo; + public function __construct( + ViewService $viewService, + SearchService $searchService, + EntityContext $entityContextManager + ) { $this->viewService = $viewService; $this->searchService = $searchService; + $this->entityContextManager = $entityContextManager; parent::__construct(); } /** * Searches all entities. - * @param Request $request - * @return \Illuminate\View\View - * @internal param string $searchTerm */ public function search(Request $request) { @@ -38,7 +37,7 @@ class SearchController extends Controller $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm])); $page = intval($request->get('page', '0')) ?: 1; - $nextPageLink = baseUrl('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1)); + $nextPageLink = url('/http/source.bookstackapp.com/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1)); $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20); @@ -54,12 +53,8 @@ class SearchController extends Controller /** * Searches all entities within a book. - * @param Request $request - * @param integer $bookId - * @return \Illuminate\View\View - * @internal param string $searchTerm */ - public function searchBook(Request $request, $bookId) + public function searchBook(Request $request, int $bookId) { $term = $request->get('term', ''); $results = $this->searchService->searchBook($bookId, $term); @@ -68,12 +63,8 @@ class SearchController extends Controller /** * Searches all entities within a chapter. - * @param Request $request - * @param integer $chapterId - * @return \Illuminate\View\View - * @internal param string $searchTerm */ - public function searchChapter(Request $request, $chapterId) + public function searchChapter(Request $request, int $chapterId) { $term = $request->get('term', ''); $results = $this->searchService->searchChapter($chapterId, $term); @@ -83,8 +74,6 @@ class SearchController extends Controller /** * Search for a list of entities and return a partial HTML response of matching entities. * Returns the most popular entities if no search is provided. - * @param Request $request - * @return mixed */ public function searchEntitiesAjax(Request $request) { @@ -105,15 +94,13 @@ class SearchController extends Controller /** * Search siblings items in the system. - * @param Request $request - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View|mixed */ public function searchSiblings(Request $request) { $type = $request->get('entity_type', null); $id = $request->get('entity_id', null); - $entity = $this->entityRepo->getById($type, $id); + $entity = Entity::getEntityInstance($type)->newQuery()->visible()->find($id); if (!$entity) { return $this->jsonError(trans('errors.entity_not_found'), 404); } @@ -122,24 +109,29 @@ class SearchController extends Controller // Page in chapter if ($entity->isA('page') && $entity->chapter) { - $entities = $this->entityRepo->getChapterChildren($entity->chapter); + $entities = $entity->chapter->visiblePages(); } // Page in book or chapter if (($entity->isA('page') && !$entity->chapter) || $entity->isA('chapter')) { - $entities = $this->entityRepo->getBookDirectChildren($entity->book); + $entities = $entity->book->getDirectChildren(); } - // Book in shelf - // TODO - When shelve tracking added, Update below if criteria - // Book + // Gets just the books in a shelf if shelf is in context if ($entity->isA('book')) { - $entities = $this->entityRepo->getAll('book'); + $contextShelf = $this->entityContextManager->getContextualShelfForBook($entity); + if ($contextShelf) { + $entities = $contextShelf->visibleBooks()->get(); + } else { + $entities = Book::visible()->get(); + } } // Shelve - // TODO - When shelve tracking added + if ($entity->isA('bookshelf')) { + $entities = Bookshelf::visible()->get(); + } return view('partials.entity-list-basic', ['entities' => $entities, 'style' => 'compact']); }