github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-22 20:11:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Input WYSIWYG: Updated exports to handle HTML descriptions

Browse Source
This commit is contained in:
Dan Brown 2023-12-22 14:57:20 +00:00
parent fb3cfaf7c7
commit 7cd0629a75
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/exports/book.blade.php
View File

@ -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])

2
resources/views/exports/chapter.blade.php
View File

@ -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])

2
resources/views/exports/parts/chapter-item.blade.php
View File

@ -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)

28
tests/Entity/ExportTest.php
View File

@ -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();