Fixed page includes erroring on save

Closes #514

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index c3090af83da072151838ffc308934ef79956d7f0..fd36b31584570c3dc15ade983a741a775e98600f 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -158,9 +158,9 @@ class PageController extends Controller
 
         $this->checkOwnablePermission('page-view', $page);
 
 
         $this->checkOwnablePermission('page-view', $page);
 

-        $pageContent = $this->entityRepo->renderPage($page);
+        $page->html = $this->entityRepo->renderPage($page);

         $sidebarTree = $this->entityRepo->getBookChildren($page->book);
         $sidebarTree = $this->entityRepo->getBookChildren($page->book);

-        $pageNav = $this->entityRepo->getPageNav($pageContent);
+        $pageNav = $this->entityRepo->getPageNav($page->html);

         $page->load(['comments.createdBy']);
 
         Views::add($page);
         $page->load(['comments.createdBy']);
 
         Views::add($page);


@@ -441,6 +441,7 @@ class PageController extends Controller
     public function exportPdf($bookSlug, $pageSlug)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
     public function exportPdf($bookSlug, $pageSlug)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

+        $page->html = $this->entityRepo->renderPage($page);

         $pdfContent = $this->exportService->pageToPdf($page);
         return response()->make($pdfContent, 200, [
             'Content-Type'        => 'application/octet-stream',
         $pdfContent = $this->exportService->pageToPdf($page);
         return response()->make($pdfContent, 200, [
             'Content-Type'        => 'application/octet-stream',


@@ -457,6 +458,7 @@ class PageController extends Controller
     public function exportHtml($bookSlug, $pageSlug)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
     public function exportHtml($bookSlug, $pageSlug)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

+        $page->html = $this->entityRepo->renderPage($page);

         $containedHtml = $this->exportService->pageToContainedHtml($page);
         return response()->make($containedHtml, 200, [
             'Content-Type'        => 'application/octet-stream',
         $containedHtml = $this->exportService->pageToContainedHtml($page);
         return response()->make($containedHtml, 200, [
             'Content-Type'        => 'application/octet-stream',

diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php
index 9a6db3fc35f9504bd2e74f5eebaa7a675883feb3..c2899b136ad341137642f30bb0e85605d5639e91 100644 (file)
--- a/app/Repos/EntityRepo.php
+++ b/app/Repos/EntityRepo.php
@@ -716,7 +716,6 @@ class EntityRepo
             $content = str_replace($matches[0][$index], trim($innerContent), $content);
         }
 
             $content = str_replace($matches[0][$index], trim($innerContent), $content);
         }
 

-        $page->setAttribute('renderedHTML', $content);

         return $content;
     }
 
         return $content;
     }
 

diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index 6b64c2c640ef8427f72322ae489b9508636bf44e..cd6526aecb1758bb530b69a3b9a6a26d53b522c6 100644 (file)
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -35,6 +35,21 @@ class PageContentTest extends TestCase
         $pageContent->assertSee('Well This is a second block of content');
     }
 
         $pageContent->assertSee('Well This is a second block of content');
     }
 

+    public function test_saving_page_with_includes()
+    {
+        $page = Page::first();
+        $secondPage = Page::all()->get(2);
+        $this->asEditor();
+        $page->html = "<p>{{@$secondPage->id}}</p>";
+
+        $resp = $this->put($page->getUrl(), ['name' => $page->name, 'html' => $page->html, 'summary' => '']);
+
+        $resp->assertStatus(302);
+
+        $page = Page::find($page->id);
+        $this->assertContains("{{@$secondPage->id}}", $page->html);
+    }
+

     public function test_page_revision_views_viewable()
     {
         $this->asEditor();
     public function test_page_revision_views_viewable()
     {
         $this->asEditor();