Added breadcrumbs to pages in entity select

Fixes #391

diff --git a/package.json b/package.json
index fb5e5a54a8e62b712d1c1e975e3aaea9af324d2f..429572882c46fdb1f8fd81adfe680c0090abf9a4 100644 (file)
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
     "build": "gulp build",
     "production": "gulp build --production",
     "dev": "gulp",
-    "watch": "gulp"
+    "watch": "gulp",
+    "permissions": "chown -R $USER:$USER bootstrap/cache storage public/uploads"
   },
   "devDependencies": {
     "babelify": "^7.3.0",

diff --git a/resources/views/chapters/list-item.blade.php b/resources/views/chapters/list-item.blade.php
index 8487a63a3e5e4e4e20ce242b06aaeb6a192fc2ea..1ae20b301c6e794b03267ee9e8038a66218e43ca 100644 (file)
--- a/resources/views/chapters/list-item.blade.php
+++ b/resources/views/chapters/list-item.blade.php
@@ -2,7 +2,7 @@
     <h4>
         @if (isset($showPath) && $showPath)
             <a href="{{ $chapter->book->getUrl() }}" class="text-book">
-                <i class="zmdi zmdi-book"></i>{{ $chapter->book->name }}
+                <i class="zmdi zmdi-book"></i>{{ $chapter->book->getShortName() }}
             </a>
             <span class="text-muted">&nbsp;&nbsp;&raquo;&nbsp;&nbsp;</span>
         @endif

diff --git a/resources/views/pages/list-item.blade.php b/resources/views/pages/list-item.blade.php
index 70b309e7d7446b91b4996c0d104a89b706d6078c..f440a52f6afa18d8e3f26ac0e67599af259db232 100644 (file)
--- a/resources/views/pages/list-item.blade.php
+++ b/resources/views/pages/list-item.blade.php
@@ -1,5 +1,17 @@
 <div class="page {{$page->draft ? 'draft' : ''}} entity-list-item" data-entity-type="page" data-entity-id="{{$page->id}}">
     <h4>
+        @if (isset($showPath) && $showPath)
+            <a href="{{ $page->book->getUrl() }}" class="text-book">
+                <i class="zmdi zmdi-book"></i>{{ $page->book->getShortName() }}
+            </a>
+            <span class="text-muted">&nbsp;&nbsp;&raquo;&nbsp;&nbsp;</span>
+            @if($page->chapter)
+                <a href="{{ $page->chapter->getUrl() }}" class="text-chapter">
+                    <i class="zmdi zmdi-collection-bookmark"></i>{{ $page->chapter->getShortName() }}
+                </a>
+                <span class="text-muted">&nbsp;&nbsp;&raquo;&nbsp;&nbsp;</span>
+            @endif
+        @endif
         <a href="{{ $page->getUrl() }}" class="text-page entity-list-item-link"><i class="zmdi zmdi-file-text"></i><span class="entity-list-item-name">{{ $page->name }}</span></a>
     </h4>
 

diff --git a/resources/views/search/entity-ajax-list.blade.php b/resources/views/search/entity-ajax-list.blade.php
index 93f2633aac12a73772fc3441f91eb56ebaf7c52f..9a146506f24729adaac8d8fe8a415e2e165600db 100644 (file)
--- a/resources/views/search/entity-ajax-list.blade.php
+++ b/resources/views/search/entity-ajax-list.blade.php
@@ -2,7 +2,7 @@
     @if(count($entities) > 0)
         @foreach($entities as $index => $entity)
             @if($entity->isA('page'))
-                @include('pages/list-item', ['page' => $entity])
+                @include('pages/list-item', ['page' => $entity, 'showPath' => true])
             @elseif($entity->isA('book'))
                 @include('books/list-item', ['book' => $entity])
             @elseif($entity->isA('chapter'))

diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index 94e28e94450db50de762fdde2e62383150eb5767..587430918610db0e0c6b3e1c8af44a32286cea8c 100644 (file)
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -1,6 +1,9 @@
 <?php namespace Tests;
 
 
+use BookStack\Chapter;
+use BookStack\Page;
+
 class EntitySearchTest extends TestCase
 {
 
@@ -75,10 +78,10 @@ class EntitySearchTest extends TestCase
             ])
         ];
 
-        $pageA = \BookStack\Page::first();
+        $pageA = Page::first();
         $pageA->tags()->saveMany($newTags);
 
-        $pageB = \BookStack\Page::all()->last();
+        $pageB = Page::all()->last();
         $pageB->tags()->create(['name' => 'animal', 'value' => 'dog']);
 
         $this->asEditor();
@@ -160,8 +163,8 @@ class EntitySearchTest extends TestCase
 
     public function test_ajax_entity_search()
     {
-        $page = \BookStack\Page::all()->last();
-        $notVisitedPage = \BookStack\Page::first();
+        $page = Page::all()->last();
+        $notVisitedPage = Page::first();
 
         // Visit the page to make popular
         $this->asEditor()->get($page->getUrl());
@@ -176,4 +179,20 @@ class EntitySearchTest extends TestCase
         $defaultListTest->assertSee($page->name);
         $defaultListTest->assertDontSee($notVisitedPage->name);
     }
+
+    public function test_ajax_entity_serach_shows_breadcrumbs()
+    {
+        $chapter = Chapter::first();
+        $page = $chapter->pages->first();
+        $this->asEditor();
+
+        $pageSearch = $this->get('/ajax/search/entities?term=' . urlencode($page->name));
+        $pageSearch->assertSee($page->name);
+        $pageSearch->assertSee($chapter->getShortName());
+        $pageSearch->assertSee($page->book->getShortName());
+
+        $chapterSearch = $this->get('/ajax/search/entities?term=' . urlencode($chapter->name));
+        $chapterSearch->assertSee($chapter->name);
+        $chapterSearch->assertSee($chapter->book->getShortName());
+    }
 }