Skip to content

NOW MANAGED ON CODEBERG

Input WYSIWYG: Updated exports to handle HTML descriptions

Dan Brown7cd0629a75b2
diff --git a/resources/views/exports/book.blade.php b/resources/views/exports/book.blade.php
index 42e03ea01..9de7b8eba 100644
--- a/resources/views/exports/book.blade.php
+++ b/resources/views/exports/book.blade.php
@@ -5,7 +5,7 @@
@section('content')
<h1 style="font-size: 4.8em">{{$book->name}}</h1>
- <p>{{ $book->description }}</p>
+ <div>{!! $book->descriptionHtml() !!}</div>
@include('exports.parts.book-contents-menu', ['children' => $bookChildren])
diff --git a/resources/views/exports/chapter.blade.php b/resources/views/exports/chapter.blade.php
index ae49fa918..515366d60 100644
--- a/resources/views/exports/chapter.blade.php
+++ b/resources/views/exports/chapter.blade.php
@@ -5,7 +5,7 @@
@section('content')
<h1 style="font-size: 4.8em">{{$chapter->name}}</h1>
- <p>{{ $chapter->description }}</p>
+ <div>{!! $chapter->descriptionHtml() !!}</div>
@include('exports.parts.chapter-contents-menu', ['pages' => $pages])
diff --git a/resources/views/exports/parts/chapter-item.blade.php b/resources/views/exports/parts/chapter-item.blade.php
index f58068b5e..fa0b1f228 100644
--- a/resources/views/exports/parts/chapter-item.blade.php
+++ b/resources/views/exports/parts/chapter-item.blade.php
@@ -1,7 +1,7 @@
<div class="page-break"></div>
<h1 id="chapter-{{$chapter->id}}">{{ $chapter->name }}</h1>
-<p>{{ $chapter->description }}</p>
+<div>{!! $chapter->descriptionHtml() !!}</div>
@if(count($chapter->visible_pages) > 0)
@foreach($chapter->visible_pages as $page)
diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index 08bf17d0a..eedcb672c 100644
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -107,18 +107,18 @@ class ExportTest extends TestCase
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.html"');
}
- public function test_book_html_export_shows_chapter_descriptions()
+ public function test_book_html_export_shows_html_descriptions()
{
- $chapterDesc = 'My custom test chapter description ' . Str::random(12);
- $chapter = $this->entities->chapter();
- $chapter->description = $chapterDesc;
+ $book = $this->entities->bookHasChaptersAndPages();
+ $chapter = $book->chapters()->first();
+ $book->description_html = '<p>A description with <strong>HTML</strong> within!</p>';
+ $chapter->description_html = '<p>A chapter description with <strong>HTML</strong> within!</p>';
+ $book->save();
$chapter->save();
- $book = $chapter->book;
- $this->asEditor();
-
- $resp = $this->get($book->getUrl('/export/html'));
- $resp->assertSee($chapterDesc);
+ $resp = $this->asEditor()->get($book->getUrl('/export/html'));
+ $resp->assertSee($book->description_html, false);
+ $resp->assertSee($chapter->description_html, false);
}
public function test_chapter_text_export()
@@ -174,6 +174,16 @@ class ExportTest extends TestCase
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html"');
}
+ public function test_chapter_html_export_shows_html_descriptions()
+ {
+ $chapter = $this->entities->chapter();
+ $chapter->description_html = '<p>A description with <strong>HTML</strong> within!</p>';
+ $chapter->save();
+
+ $resp = $this->asEditor()->get($chapter->getUrl('/export/html'));
+ $resp->assertSee($chapter->description_html, false);
+ }
+
public function test_page_html_export_contains_custom_head_if_set()
{
$page = $this->entities->page();