#47 - Fixes the issues with the test case.

[bookstack] / app / Page.php

diff --git a/app/Page.php b/app/Page.php
index 83ef6f3503fad5a678bcda8c4fb0597adc82486c..d722e4e545e822aeeb511013fffb035fa1b8c985 100644 (file)
--- a/app/Page.php
+++ b/app/Page.php
@@ -8,8 +8,7 @@ class Page extends Entity
     protected $simpleAttributes = ['name', 'id', 'slug'];
 
     protected $with = ['book'];
-
-    protected $fieldsToSearch = ['name', 'text'];
+    public $textField = 'text';
 
     /**
      * Converts this page into a simplified array.
@@ -39,15 +38,6 @@ class Page extends Entity
     {
         return $this->belongsTo(Chapter::class);
     }
-    
-    /**
-     * Get the comments in the page.
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function comment()
-    {
-        return $this->hasMany(Comment::class);
-    }
 
     /**
      * Check if this page has a chapter.
@@ -76,6 +66,10 @@ class Page extends Entity
         return $this->hasMany(Attachment::class, 'uploaded_to')->orderBy('order', 'asc');
     }
 
+    public function comments() {
+        return $this->hasMany(Comment::class, 'page_id')->orderBy('created_on', 'asc');
+    }
+
     /**
      * Get the url for this page.
      * @param string|bool $path
@@ -105,4 +99,14 @@ class Page extends Entity
         return mb_convert_encoding($text, 'UTF-8');
     }
 
+    /**
+     * Return a generalised, common raw query that can be 'unioned' across entities.
+     * @param bool $withContent
+     * @return string
+     */
+    public function entityRawQuery($withContent = false)
+    {   $htmlQuery = $withContent ? 'html' : "'' as html";
+        return "'BookStack\\\\Page' as entity_type, id, id as entity_id, slug, name, {$this->textField} as text, {$htmlQuery}, book_id, priority, chapter_id, draft, created_by, updated_by, updated_at, created_at";
+    }
+
 }