Fix for getting book items

diff --git a/app/Book.php b/app/Book.php
index ccf02e4f31b040881bb3474624a204bdcc299222..35df08338d09046bf68ff52221ad560b934e1d50 100644 (file)
--- a/app/Book.php
+++ b/app/Book.php
@@ -33,8 +33,10 @@ class Book extends Model
     {
         $pages = $this->pages()->where('chapter_id', '=', 0)->get();
         $chapters = $this->chapters()->get();
-        $children = $pages->merge($chapters);
-        return $children->sortBy('priority');
+        foreach($chapters as $chapter) {
+            $pages->push($chapter);
+        }
+        return $pages->sortBy('priority');
     }
 
 }

diff --git a/app/Repos/BookRepo.php b/app/Repos/BookRepo.php
index b98ed9abad59a60f37f253aa335de0e06bd53307..5a772539f113bf11dcfe774e307448cb82de2949 100644 (file)
--- a/app/Repos/BookRepo.php
+++ b/app/Repos/BookRepo.php
@@ -47,8 +47,11 @@ class BookRepo
     public function destroyBySlug($bookSlug)
     {
         $book = $this->getBySlug($bookSlug);
-        foreach($book->children() as $child) {
-            $child->delete();
+        foreach($book->pages as $page) {
+            $page->delete();
+        }
+        foreach($book->chapters as $chapter) {
+            $chapter->delete();
         }
         $book->delete();
     }