Update common.php

[bookstack] / app / Http / Controllers / SearchController.php

diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 8ce5aaa7461bdc839e49e7f14b8ba6ef3055f318..1691ee9b0bf937f338436305baa8b9beea3bb24f 100644 (file)
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -1,35 +1,45 @@
 <?php namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\ViewService;
 <?php namespace BookStack\Http\Controllers;
 
 use BookStack\Actions\ViewService;

+use BookStack\Entities\EntityContextManager;

 use BookStack\Entities\Repos\EntityRepo;
 use BookStack\Entities\SearchService;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Entities\Repos\EntityRepo;
 use BookStack\Entities\SearchService;
 use BookStack\Exceptions\NotFoundException;

+use Illuminate\Contracts\View\Factory;

 use Illuminate\Http\Request;
 use Illuminate\Http\Request;

+use Illuminate\View\View;

 
 class SearchController extends Controller
 {
     protected $entityRepo;
     protected $viewService;
     protected $searchService;
 
 class SearchController extends Controller
 {
     protected $entityRepo;
     protected $viewService;
     protected $searchService;

+    protected $entityContextManager;

 
     /**
      * SearchController constructor.
 
     /**
      * SearchController constructor.

-     * @param \BookStack\Entities\Repos\EntityRepo $entityRepo
+     * @param EntityRepo $entityRepo

      * @param ViewService $viewService
      * @param SearchService $searchService
      * @param ViewService $viewService
      * @param SearchService $searchService

+     * @param EntityContextManager $entityContextManager

      */
      */

-    public function __construct(EntityRepo $entityRepo, ViewService $viewService, SearchService $searchService)
-    {
+    public function __construct(
+        EntityRepo $entityRepo,
+        ViewService $viewService,
+        SearchService $searchService,
+        EntityContextManager $entityContextManager
+    ) {

         $this->entityRepo = $entityRepo;
         $this->viewService = $viewService;
         $this->searchService = $searchService;
         $this->entityRepo = $entityRepo;
         $this->viewService = $viewService;
         $this->searchService = $searchService;

+        $this->entityContextManager = $entityContextManager;

         parent::__construct();
     }
 
     /**
      * Searches all entities.
      * @param Request $request
         parent::__construct();
     }
 
     /**
      * Searches all entities.
      * @param Request $request

-     * @return \Illuminate\View\View
+     * @return View

      * @internal param string $searchTerm
      */
     public function search(Request $request)
      * @internal param string $searchTerm
      */
     public function search(Request $request)


@@ -38,11 +48,11 @@ class SearchController extends Controller
         $this->setPageTitle(trans('entities.search_for_term', ['term' => $searchTerm]));
 
         $page = intval($request->get('page', '0')) ?: 1;
         $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('/search?term=' . urlencode($searchTerm) . '&page=' . ($page+1));

 
         $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
 
 
         $results = $this->searchService->searchEntities($searchTerm, 'all', $page, 20);
 

-        return view('search/all', [
+        return view('search.all', [

             'entities'   => $results['results'],
             'totalResults' => $results['total'],
             'searchTerm' => $searchTerm,
             'entities'   => $results['results'],
             'totalResults' => $results['total'],
             'searchTerm' => $searchTerm,


@@ -56,28 +66,28 @@ class SearchController extends Controller
      * Searches all entities within a book.
      * @param Request $request
      * @param integer $bookId
      * Searches all entities within a book.
      * @param Request $request
      * @param integer $bookId

-     * @return \Illuminate\View\View
+     * @return View

      * @internal param string $searchTerm
      */
     public function searchBook(Request $request, $bookId)
     {
         $term = $request->get('term', '');
         $results = $this->searchService->searchBook($bookId, $term);
      * @internal param string $searchTerm
      */
     public function searchBook(Request $request, $bookId)
     {
         $term = $request->get('term', '');
         $results = $this->searchService->searchBook($bookId, $term);

-        return view('partials/entity-list', ['entities' => $results]);
+        return view('partials.entity-list', ['entities' => $results]);

     }
 
     /**
      * Searches all entities within a chapter.
      * @param Request $request
      * @param integer $chapterId
     }
 
     /**
      * Searches all entities within a chapter.
      * @param Request $request
      * @param integer $chapterId

-     * @return \Illuminate\View\View
+     * @return View

      * @internal param string $searchTerm
      */
     public function searchChapter(Request $request, $chapterId)
     {
         $term = $request->get('term', '');
         $results = $this->searchService->searchChapter($chapterId, $term);
      * @internal param string $searchTerm
      */
     public function searchChapter(Request $request, $chapterId)
     {
         $term = $request->get('term', '');
         $results = $this->searchService->searchChapter($chapterId, $term);

-        return view('partials/entity-list', ['entities' => $results]);
+        return view('partials.entity-list', ['entities' => $results]);

     }
 
     /**
     }
 
     /**


@@ -106,7 +116,7 @@ class SearchController extends Controller
     /**
      * Search siblings items in the system.
      * @param Request $request
     /**
      * Search siblings items in the system.
      * @param Request $request

-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View|mixed
+     * @return Factory|View|mixed

      */
     public function searchSiblings(Request $request)
     {
      */
     public function searchSiblings(Request $request)
     {


@@ -130,16 +140,21 @@ class SearchController extends Controller
             $entities = $this->entityRepo->getBookDirectChildren($entity->book);
         }
 
             $entities = $this->entityRepo->getBookDirectChildren($entity->book);
         }
 

-        // Book in shelf
-        // TODO - When shelve tracking added, Update below if criteria
-

         // Book
         // Book

+        // Gets just the books in a shelf if shelf is in context

         if ($entity->isA('book')) {
         if ($entity->isA('book')) {

-            $entities = $this->entityRepo->getAll('book');
+            $contextShelf = $this->entityContextManager->getContextualShelfForBook($entity);
+            if ($contextShelf) {
+                $entities = $this->entityRepo->getBookshelfChildren($contextShelf);
+            } else {
+                $entities = $this->entityRepo->getAll('book');
+            }

         }
 
         // Shelve
         }
 
         // Shelve

-        // TODO - When shelve tracking added
+        if ($entity->isA('bookshelf')) {
+            $entities = $this->entityRepo->getAll('bookshelf');
+        }

 
         return view('partials.entity-list-basic', ['entities' => $entities, 'style' => 'compact']);
     }
 
         return view('partials.entity-list-basic', ['entities' => $entities, 'style' => 'compact']);
     }