github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-12-12 13:33:46 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ZIP Imports: Added book content ordering to import preview

Browse Source
This commit is contained in:
Dan Brown 2024-11-22 21:03:04 +00:00
parent 59cfc087e1
commit c0dff6d4a6
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
5 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Exports/ZipExports/Models/ZipExportBook.php
View File

@ -36,6 +36,20 @@ class ZipExportBook extends ZipExportModel
} }
} }
public function children(): array
{
$children = [
...$this->pages,
...$this->chapters,
];
usort($children, function ($a, $b) {
return ($a->priority ?? 0) - ($b->priority ?? 0);
});
return $children;
}
public static function fromModel(Book $model, ZipExportFiles $files): self public static function fromModel(Book $model, ZipExportFiles $files): self
{ {
$instance = new self(); $instance = new self();

7
app/Exports/ZipExports/Models/ZipExportChapter.php
View File

@ -20,7 +20,7 @@ class ZipExportChapter extends ZipExportModel
public function metadataOnly(): void public function metadataOnly(): void
{ {
$this->description_html = $this->priority = null; $this->description_html = null;
foreach ($this->pages as $page) { foreach ($this->pages as $page) {
$page->metadataOnly(); $page->metadataOnly();
@ -30,6 +30,11 @@ class ZipExportChapter extends ZipExportModel
} }
} }
public function children(): array
{
return $this->pages;
}
public static function fromModel(Chapter $model, ZipExportFiles $files): self public static function fromModel(Chapter $model, ZipExportFiles $files): self
{ {
$instance = new self(); $instance = new self();

2
app/Exports/ZipExports/Models/ZipExportPage.php
View File

@ -23,7 +23,7 @@ class ZipExportPage extends ZipExportModel
public function metadataOnly(): void public function metadataOnly(): void
{ {
$this->html = $this->markdown = $this->priority = null; $this->html = $this->markdown = null;
foreach ($this->attachments as $attachment) { foreach ($this->attachments as $attachment) {
$attachment->metadataOnly(); $attachment->metadataOnly();

1
app/Exports/ZipExports/ZipExportReader.php
View File

@ -5,7 +5,6 @@ namespace BookStack\Exports\ZipExports;
use BookStack\Exceptions\ZipExportException; use BookStack\Exceptions\ZipExportException;
use BookStack\Exports\ZipExports\Models\ZipExportBook; use BookStack\Exports\ZipExports\Models\ZipExportBook;
use BookStack\Exports\ZipExports\Models\ZipExportChapter; use BookStack\Exports\ZipExports\Models\ZipExportChapter;
use BookStack\Exports\ZipExports\Models\ZipExportModel;
use BookStack\Exports\ZipExports\Models\ZipExportPage; use BookStack\Exports\ZipExports\Models\ZipExportPage;
use BookStack\Util\WebSafeMimeSniffer; use BookStack\Util\WebSafeMimeSniffer;
use ZipArchive; use ZipArchive;

12
resources/views/exports/parts/import-item.blade.php
View File

@ -16,11 +16,13 @@ $model - object
<span>@icon('tag'){{ count($model->tags) }}</span> <span>@icon('tag'){{ count($model->tags) }}</span>
@endif @endif
</div> </div>
@foreach($model->chapters ?? [] as $chapter) @if(method_exists($model, 'children'))
@include('exports.parts.import-item', ['type' => 'chapter', 'model' => $chapter]) @foreach($model->children() as $child)
@endforeach @include('exports.parts.import-item', [
@foreach($model->pages ?? [] as $page) 'type' => ($child instanceof \BookStack\Exports\ZipExports\Models\ZipExportPage) ? 'page' : 'chapter',
@include('exports.parts.import-item', ['type' => 'page', 'model' => $page]) 'model' => $child
])
@endforeach @endforeach
@endif
</div> </div>
</div> </div>