Show bookshelves that a book belongs to on a book view

[bookstack] / app / Entities / Repos / PageRepo.php

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 208aa5fa309444dabd61839a3fdc43b2d0a536b3..0e0585a8549ab95f755f29143c9c267b4f0cee54 100644 (file)
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -20,9 +20,9 @@ class PageRepo extends EntityRepo
      * @return Page
      * @throws \BookStack\Exceptions\NotFoundException
      */
      * @return Page
      * @throws \BookStack\Exceptions\NotFoundException
      */

-    public function getPageBySlug(string $pageSlug, string $bookSlug)
+    public function getBySlug(string $pageSlug, string $bookSlug)

     {
     {

-        return $this->getBySlug('page', $pageSlug, $bookSlug);
+        return $this->getEntityBySlug('page', $pageSlug, $bookSlug);

     }
 
     /**
     }
 
     /**


@@ -59,34 +59,40 @@ class PageRepo extends EntityRepo
         $oldHtml = $page->html;
         $oldName = $page->name;
 
         $oldHtml = $page->html;
         $oldName = $page->name;
 

-        // Prevent slug being updated if no name change
-        if ($page->name !== $input['name']) {
-            $page->slug = $this->findSuitableSlug('page', $input['name'], $page->id, $book_id);
-        }
-

         // Save page tags if present
         if (isset($input['tags'])) {
             $this->tagRepo->saveTagsToEntity($page, $input['tags']);
         }
 
         // Save page tags if present
         if (isset($input['tags'])) {
             $this->tagRepo->saveTagsToEntity($page, $input['tags']);
         }
 

+        if (isset($input['template']) && userCan('templates-manage')) {
+            $page->template = ($input['template'] === 'true');
+        }
+

         // Update with new details
         $userId = user()->id;
         $page->fill($input);
         $page->html = $this->formatHtml($input['html']);
         $page->text = $this->pageToPlainText($page);
         // Update with new details
         $userId = user()->id;
         $page->fill($input);
         $page->html = $this->formatHtml($input['html']);
         $page->text = $this->pageToPlainText($page);

+        $page->updated_by = $userId;
+        $page->revision_count++;
+

         if (setting('app-editor') !== 'markdown') {
             $page->markdown = '';
         }
         if (setting('app-editor') !== 'markdown') {
             $page->markdown = '';
         }

-        $page->updated_by = $userId;
-        $page->revision_count++;
+
+        if ($page->isDirty('name')) {
+            $page->refreshSlug();
+        }
+

         $page->save();
 
         // Remove all update drafts for this user & page.
         $this->userUpdatePageDraftsQuery($page, $userId)->delete();
 
         // Save a revision after updating
         $page->save();
 
         // Remove all update drafts for this user & page.
         $this->userUpdatePageDraftsQuery($page, $userId)->delete();
 
         // Save a revision after updating

-        if ($oldHtml !== $input['html'] || $oldName !== $input['name'] || $input['summary'] !== null) {
-            $this->savePageRevision($page, $input['summary']);
+        $summary = $input['summary'] ?? null;
+        if ($oldHtml !== $input['html'] || $oldName !== $input['name'] || $summary !== null) {
+            $this->savePageRevision($page, $summary);

         }
 
         $this->searchService->indexEntity($page);
         }
 
         $this->searchService->indexEntity($page);


@@ -192,7 +198,7 @@ class PageRepo extends EntityRepo
         // Create an unique id for the element
         // Uses the content as a basis to ensure output is the same every time
         // the same content is passed through.
         // Create an unique id for the element
         // Uses the content as a basis to ensure output is the same every time
         // the same content is passed through.

-        $contentId = 'bkmrk-' . substr(strtolower(preg_replace('/\s+/', '-', trim($element->nodeValue))), 0, 20);
+        $contentId = 'bkmrk-' . mb_substr(strtolower(preg_replace('/\s+/', '-', trim($element->nodeValue))), 0, 20);

         $newId = urlencode($contentId);
         $loopIndex = 0;
 
         $newId = urlencode($contentId);
         $loopIndex = 0;
 


@@ -236,8 +242,7 @@ class PageRepo extends EntityRepo
         }
 
         $book->pages()->save($page);
         }
 
         $book->pages()->save($page);

-        $page = $this->entityProvider->page->find($page->id);
-        $this->permissionService->buildJointPermissionsForEntity($page);
+        $page->refresh()->rebuildPermissions();

         return $page;
     }
 
         return $page;
     }
 


@@ -300,12 +305,15 @@ class PageRepo extends EntityRepo
             $this->tagRepo->saveTagsToEntity($draftPage, $input['tags']);
         }
 
             $this->tagRepo->saveTagsToEntity($draftPage, $input['tags']);
         }
 

-        $draftPage->slug = $this->findSuitableSlug('page', $draftPage->name, false, $draftPage->book->id);
+        if (isset($input['template']) && userCan('templates-manage')) {
+            $draftPage->template = ($input['template'] === 'true');
+        }
+

         $draftPage->html = $this->formatHtml($input['html']);
         $draftPage->text = $this->pageToPlainText($draftPage);
         $draftPage->draft = false;
         $draftPage->revision_count = 1;
         $draftPage->html = $this->formatHtml($input['html']);
         $draftPage->text = $this->pageToPlainText($draftPage);
         $draftPage->draft = false;
         $draftPage->revision_count = 1;

-
+        $draftPage->refreshSlug();

         $draftPage->save();
         $this->savePageRevision($draftPage, trans('entities.pages_initial_revision'));
         $this->searchService->indexEntity($draftPage);
         $draftPage->save();
         $this->savePageRevision($draftPage, trans('entities.pages_initial_revision'));
         $this->searchService->indexEntity($draftPage);


@@ -422,11 +430,9 @@ class PageRepo extends EntityRepo
             return [];
         }
 
             return [];
         }
 

-        $tree = collect($headers)->map(function($header) {
+        $tree = collect($headers)->map(function ($header) {

             $text = trim(str_replace("\xc2\xa0", '', $header->nodeValue));
             $text = trim(str_replace("\xc2\xa0", '', $header->nodeValue));

-            if (strlen($text) > 30) {
-                $text = substr($text, 0, 27) . '...';
-            }
+            $text = mb_substr($text, 0, 100);

 
             return [
                 'nodeName' => strtolower($header->nodeName),
 
             return [
                 'nodeName' => strtolower($header->nodeName),


@@ -434,14 +440,14 @@ class PageRepo extends EntityRepo
                 'link' => '#' . $header->getAttribute('id'),
                 'text' => $text,
             ];
                 'link' => '#' . $header->getAttribute('id'),
                 'text' => $text,
             ];

-        })->filter(function($header) {
-            return strlen($header['text']) > 0;
+        })->filter(function ($header) {
+            return mb_strlen($header['text']) > 0;

         });
 
         });
 

-        // Normalise headers if only smaller headers have been used
-        $minLevel = $tree->pluck('level')->min();
-        $tree = $tree->map(function ($header) use ($minLevel) {
-            $header['level'] -= ($minLevel - 2);
+        // Shift headers if only smaller headers have been used
+        $levelChange = ($tree->pluck('level')->min() - 1);
+        $tree = $tree->map(function ($header) use ($levelChange) {
+            $header['level'] -= ($levelChange);

             return $header;
         });
 
             return $header;
         });
 


@@ -460,12 +466,14 @@ class PageRepo extends EntityRepo
     {
         $page->revision_count++;
         $this->savePageRevision($page);
     {
         $page->revision_count++;
         $this->savePageRevision($page);

+

         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         $page->fill($revision->toArray());
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
         $page->fill($revision->toArray());

-        $page->slug = $this->findSuitableSlug('page', $page->name, $page->id, $book->id);

         $page->text = $this->pageToPlainText($page);
         $page->updated_by = user()->id;
         $page->text = $this->pageToPlainText($page);
         $page->updated_by = user()->id;

+        $page->refreshSlug();

         $page->save();
         $page->save();

+

         $this->searchService->indexEntity($page);
         return $page;
     }
         $this->searchService->indexEntity($page);
         return $page;
     }


@@ -474,18 +482,19 @@ class PageRepo extends EntityRepo
      * Change the page's parent to the given entity.
      * @param Page $page
      * @param Entity $parent
      * Change the page's parent to the given entity.
      * @param Page $page
      * @param Entity $parent

-     * @throws \Throwable

      */
     public function changePageParent(Page $page, Entity $parent)
     {
         $book = $parent->isA('book') ? $parent : $parent->book;
         $page->chapter_id = $parent->isA('chapter') ? $parent->id : 0;
         $page->save();
      */
     public function changePageParent(Page $page, Entity $parent)
     {
         $book = $parent->isA('book') ? $parent : $parent->book;
         $page->chapter_id = $parent->isA('chapter') ? $parent->id : 0;
         $page->save();

+

         if ($page->book->id !== $book->id) {
         if ($page->book->id !== $book->id) {

-            $page = $this->changeBook('page', $book->id, $page);
+            $page = $this->changeBook($page, $book->id);

         }
         }

+

         $page->load('book');
         $page->load('book');

-        $this->permissionService->buildJointPermissionsForEntity($book);
+        $book->rebuildPermissions();

     }
 
     /**
     }
 
     /**


@@ -525,4 +534,29 @@ class PageRepo extends EntityRepo
 
         return $this->publishPageDraft($copyPage, $pageData);
     }
 
         return $this->publishPageDraft($copyPage, $pageData);
     }

+
+    /**
+     * Get pages that have been marked as templates.
+     * @param int $count
+     * @param int $page
+     * @param string $search
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
+     */
+    public function getPageTemplates(int $count = 10, int $page = 1, string $search = '')
+    {
+        $query = $this->entityQuery('page')
+            ->where('template', '=', true)
+            ->orderBy('name', 'asc')
+            ->skip(($page - 1) * $count)
+            ->take($count);
+
+        if ($search) {
+            $query->where('name', 'like', '%' . $search . '%');
+        }
+
+        $paginator = $query->paginate($count, ['*'], 'page', $page);
+        $paginator->withPath('/templates');
+
+        return $paginator;
+    }

 }
 }