updated config to also include Norwegian

[bookstack] / app / Entities / Bookshelf.php

diff --git a/app/Entities/Bookshelf.php b/app/Entities/Bookshelf.php
index 8f2cdf8ae135c677744d6ff8973d5eef9ce258df..474ba51cd8204bf27dfc95ad421029cdaa8e7375 100644 (file)
--- a/app/Entities/Bookshelf.php
+++ b/app/Entities/Bookshelf.php
@@ -1,8 +1,10 @@
 <?php namespace BookStack\Entities;
 
 use BookStack\Uploads\Image;
 <?php namespace BookStack\Entities;
 
 use BookStack\Uploads\Image;

+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;

 
 

-class Bookshelf extends Entity
+class Bookshelf extends Entity implements HasCoverImage

 {
     protected $table = 'bookshelves';
 
 {
     protected $table = 'bookshelves';
 


@@ -10,14 +12,7 @@ class Bookshelf extends Entity
 
     protected $fillable = ['name', 'description', 'image_id'];
 
 
     protected $fillable = ['name', 'description', 'image_id'];
 

-    /**
-     * Get the morph class for this model.
-     * @return string
-     */
-    public function getMorphClass()
-    {
-        return 'BookStack\\Bookshelf';
-    }
+    protected $hidden = ['restricted', 'image_id'];

 
     /**
      * Get the books in this shelf.
 
     /**
      * Get the books in this shelf.


@@ -26,7 +21,17 @@ class Bookshelf extends Entity
      */
     public function books()
     {
      */
     public function books()
     {

-        return $this->belongsToMany(Book::class, 'bookshelves_books', 'bookshelf_id', 'book_id')->orderBy('order', 'asc');
+        return $this->belongsToMany(Book::class, 'bookshelves_books', 'bookshelf_id', 'book_id')
+            ->withPivot('order')
+            ->orderBy('order', 'asc');
+    }
+
+    /**
+     * Related books that are visible to the current user.
+     */
+    public function visibleBooks(): BelongsToMany
+    {
+        return $this->books()->visible();

     }
 
     /**
     }
 
     /**


@@ -37,9 +42,9 @@ class Bookshelf extends Entity
     public function getUrl($path = false)
     {
         if ($path !== false) {
     public function getUrl($path = false)
     {
         if ($path !== false) {

-            return baseUrl('/shelves/' . urlencode($this->slug) . '/' . trim($path, '/'));
+            return url('/shelves/' . urlencode($this->slug) . '/' . trim($path, '/'));

         }
         }

-        return baseUrl('/shelves/' . urlencode($this->slug));
+        return url('/shelves/' . urlencode($this->slug));

     }
 
     /**
     }
 
     /**


@@ -57,7 +62,7 @@ class Bookshelf extends Entity
         }
 
         try {
         }
 
         try {

-            $cover = $this->cover ? baseUrl($this->cover->getThumb($width, $height, false)) : $default;
+            $cover = $this->cover ? url($this->cover->getThumb($width, $height, false)) : $default;

         } catch (\Exception $err) {
             $cover = $default;
         }
         } catch (\Exception $err) {
             $cover = $default;
         }


@@ -66,13 +71,20 @@ class Bookshelf extends Entity
 
     /**
      * Get the cover image of the shelf
 
     /**
      * Get the cover image of the shelf

-     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo

      */
      */

-    public function cover()
+    public function cover(): BelongsTo

     {
         return $this->belongsTo(Image::class, 'image_id');
     }
 
     {
         return $this->belongsTo(Image::class, 'image_id');
     }
 

+    /**
+     * Get the type of the image model that is used when storing a cover image.
+     */
+    public function coverImageTypeKey(): string
+    {
+        return 'cover_shelf';
+    }
+

     /**
      * Get an excerpt of this book's description to the specified length or less.
      * @param int $length
     /**
      * Get an excerpt of this book's description to the specified length or less.
      * @param int $length


@@ -81,15 +93,30 @@ class Bookshelf extends Entity
     public function getExcerpt(int $length = 100)
     {
         $description = $this->description;
     public function getExcerpt(int $length = 100)
     {
         $description = $this->description;

-        return strlen($description) > $length ? substr($description, 0, $length-3) . '...' : $description;
+        return mb_strlen($description) > $length ? mb_substr($description, 0, $length-3) . '...' : $description;

     }
 
     /**
     }
 
     /**

-     * Return a generalised, common raw query that can be 'unioned' across entities.
-     * @return string
+     * Check if this shelf contains the given book.
+     * @param Book $book
+     * @return bool

      */
      */

-    public function entityRawQuery()
+    public function contains(Book $book): bool

     {
     {

-        return "'BookStack\\\\BookShelf' as entity_type, id, id as entity_id, slug, name, {$this->textField} as text,'' as html, '0' as book_id, '0' as priority, '0' as chapter_id, '0' as draft, created_by, updated_by, updated_at, created_at";
+        return $this->books()->where('id', '=', $book->id)->count() > 0;
+    }
+
+    /**
+     * Add a book to the end of this shelf.
+     * @param Book $book
+     */
+    public function appendBook(Book $book)
+    {
+        if ($this->contains($book)) {
+            return;
+        }
+
+        $maxOrder = $this->books()->max('order');
+        $this->books()->attach($book->id, ['order' => $maxOrder + 1]);

     }
 }
     }
 }