Added initial translation into German (formal)

[bookstack] / app / Repos / ChapterRepo.php

diff --git a/app/Repos/ChapterRepo.php b/app/Repos/ChapterRepo.php
index 84489c075e50426ba5391d228b68af1441b834a7..96f5b2d1ea75d9c47858988b77d4489f3351be11 100644 (file)
--- a/app/Repos/ChapterRepo.php
+++ b/app/Repos/ChapterRepo.php
@@ -9,13 +9,25 @@ use BookStack\Chapter;
 
 class ChapterRepo extends EntityRepo
 {
 
 class ChapterRepo extends EntityRepo
 {

+    protected $pageRepo;
+
+    /**
+     * ChapterRepo constructor.
+     * @param $pageRepo
+     */
+    public function __construct(PageRepo $pageRepo)
+    {
+        $this->pageRepo = $pageRepo;
+        parent::__construct();
+    }
+

     /**
     /**

-     * Base query for getting chapters, Takes restrictions into account.
+     * Base query for getting chapters, Takes permissions into account.

      * @return mixed
      */
     private function chapterQuery()
     {
      * @return mixed
      */
     private function chapterQuery()
     {

-        return $this->restrictionService->enforceChapterRestrictions($this->chapter, 'view');
+        return $this->permissionService->enforceChapterRestrictions($this->chapter, 'view');

     }
 
     /**
     }
 
     /**


@@ -67,9 +79,9 @@ class ChapterRepo extends EntityRepo
      */
     public function getChildren(Chapter $chapter)
     {
      */
     public function getChildren(Chapter $chapter)
     {

-        $pages = $this->restrictionService->enforcePageRestrictions($chapter->pages())->get();
+        $pages = $this->permissionService->enforcePageRestrictions($chapter->pages())->get();

         // Sort items with drafts first then by priority.
         // Sort items with drafts first then by priority.

-        return $pages->sortBy(function($child, $key) {
+        return $pages->sortBy(function ($child, $key) {

             $score = $child->priority;
             if ($child->draft) $score -= 100;
             return $score;
             $score = $child->priority;
             if ($child->draft) $score -= 100;
             return $score;


@@ -86,10 +98,10 @@ class ChapterRepo extends EntityRepo
     {
         $chapter = $this->chapter->newInstance($input);
         $chapter->slug = $this->findSuitableSlug($chapter->name, $book->id);
     {
         $chapter = $this->chapter->newInstance($input);
         $chapter->slug = $this->findSuitableSlug($chapter->name, $book->id);

-        $chapter->created_by = auth()->user()->id;
-        $chapter->updated_by = auth()->user()->id;
+        $chapter->created_by = user()->id;
+        $chapter->updated_by = user()->id;

         $chapter = $book->chapters()->save($chapter);
         $chapter = $book->chapters()->save($chapter);

-        $this->restrictionService->buildEntityPermissionsForEntity($chapter);
+        $this->permissionService->buildJointPermissionsForEntity($chapter);

         return $chapter;
     }
 
         return $chapter;
     }
 


@@ -107,8 +119,8 @@ class ChapterRepo extends EntityRepo
         }
         Activity::removeEntity($chapter);
         $chapter->views()->delete();
         }
         Activity::removeEntity($chapter);
         $chapter->views()->delete();

-        $chapter->restrictions()->delete();
-        $this->restrictionService->deleteEntityPermissionsForEntity($chapter);
+        $chapter->permissions()->delete();
+        $this->permissionService->deleteJointPermissionsForEntity($chapter);

         $chapter->delete();
     }
 
         $chapter->delete();
     }
 


@@ -139,6 +151,7 @@ class ChapterRepo extends EntityRepo
     public function findSuitableSlug($name, $bookId, $currentId = false)
     {
         $slug = Str::slug($name);
     public function findSuitableSlug($name, $bookId, $currentId = false)
     {
         $slug = Str::slug($name);

+        if ($slug === "") $slug = substr(md5(rand(1, 500)), 0, 5);

         while ($this->doesSlugExist($slug, $bookId, $currentId)) {
             $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);
         }
         while ($this->doesSlugExist($slug, $bookId, $currentId)) {
             $slug .= '-' . substr(md5(rand(1, 500)), 0, 3);
         }


@@ -168,8 +181,9 @@ class ChapterRepo extends EntityRepo
     public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
     {
         $terms = $this->prepareSearchTerms($term);
     public function getBySearch($term, $whereTerms = [], $count = 20, $paginationAppends = [])
     {
         $terms = $this->prepareSearchTerms($term);

-        $chapters = $this->restrictionService->enforceChapterRestrictions($this->chapter->fullTextSearchQuery(['name', 'description'], $terms, $whereTerms))
-            ->paginate($count)->appends($paginationAppends);
+        $chapterQuery = $this->permissionService->enforceChapterRestrictions($this->chapter->fullTextSearchQuery(['name', 'description'], $terms, $whereTerms));
+        $chapterQuery = $this->addAdvancedSearchQueries($chapterQuery, $term);
+        $chapters = $chapterQuery->paginate($count)->appends($paginationAppends);

         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         foreach ($chapters as $chapter) {
             //highlight
         $words = join('|', explode(' ', preg_quote(trim($term), '/')));
         foreach ($chapters as $chapter) {
             //highlight


@@ -181,19 +195,32 @@ class ChapterRepo extends EntityRepo
 
     /**
      * Changes the book relation of this chapter.
 
     /**
      * Changes the book relation of this chapter.

-     * @param         $bookId
+     * @param $bookId

      * @param Chapter $chapter
      * @param Chapter $chapter

+     * @param bool $rebuildPermissions

      * @return Chapter
      */
      * @return Chapter
      */

-    public function changeBook($bookId, Chapter $chapter)
+    public function changeBook($bookId, Chapter $chapter, $rebuildPermissions = false)

     {
         $chapter->book_id = $bookId;
     {
         $chapter->book_id = $bookId;

+        // Update related activity

         foreach ($chapter->activity as $activity) {
             $activity->book_id = $bookId;
             $activity->save();
         }
         $chapter->slug = $this->findSuitableSlug($chapter->name, $bookId, $chapter->id);
         $chapter->save();
         foreach ($chapter->activity as $activity) {
             $activity->book_id = $bookId;
             $activity->save();
         }
         $chapter->slug = $this->findSuitableSlug($chapter->name, $bookId, $chapter->id);
         $chapter->save();

+        // Update all child pages
+        foreach ($chapter->pages as $page) {
+            $this->pageRepo->changeBook($bookId, $page);
+        }
+
+        // Update permissions if applicable
+        if ($rebuildPermissions) {
+            $chapter->load('book');
+            $this->permissionService->buildJointPermissionsForEntity($chapter->book);
+        }
+

         return $chapter;
     }
 
         return $chapter;
     }