From ab75eaddefd14e03e153af704cd39265cf918ba6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 13 Jun 2023 18:55:51 +0000 Subject: [PATCH] Quick backup before crash --- Controller/ApiController.php | 15 ++++++++++++++- Models/EditorDoc.php | 4 ++-- Models/EditorDocListTrait.php | 2 +- Theme/Backend/Components/Compound/BaseView.php | 10 ++++++++-- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 663a250..941e8f8 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -626,6 +626,19 @@ final class ApiController extends Controller return []; } + /** + * Export doc + * + * @param RequestAbstract $request Request + * @param ResponseAbstract $response Response + * @param mixed $data Generic data + * + * @return void + * + * @api + * + * @since 1.0.0 + */ public function apiEditorExport(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void { /** @var \Modules\Editor\Models\EditorDoc $doc */ @@ -692,7 +705,7 @@ final class ApiController extends Controller $view->data['defaultTemplates'] = $defaultTemplates; $view->data['defaultAssets'] = $defaultAssets; - $view->data['pdf'] = $pdf; + $view->data['pdf'] = $view->render(); $view->data['doc'] = $doc; $response->set('', $view->render()); diff --git a/Models/EditorDoc.php b/Models/EditorDoc.php index 94cfef9..0c96a3f 100755 --- a/Models/EditorDoc.php +++ b/Models/EditorDoc.php @@ -72,10 +72,10 @@ class EditorDoc implements \JsonSerializable /** * Type. * - * @var null|int|EditorDocType + * @var null|EditorDocType * @since 1.0.0 */ - public null | int | EditorDocType $type = null; + public ?EditorDocType $type = null; /** * Doc path for organizing. diff --git a/Models/EditorDocListTrait.php b/Models/EditorDocListTrait.php index 212d990..fd03811 100644 --- a/Models/EditorDocListTrait.php +++ b/Models/EditorDocListTrait.php @@ -24,7 +24,7 @@ namespace Modules\Editor\Models; * * @property \Modules\Editor\Models\EditorDoc[] $notes */ -trait EditorListTrait +trait EditorDocListTrait { /** * EditorDocs. diff --git a/Theme/Backend/Components/Compound/BaseView.php b/Theme/Backend/Components/Compound/BaseView.php index ca01c93..f02253d 100644 --- a/Theme/Backend/Components/Compound/BaseView.php +++ b/Theme/Backend/Components/Compound/BaseView.php @@ -54,6 +54,12 @@ class BaseView extends View */ public string $name = ''; + /** + * Media files + * + * @var \Modules\Media\Models\Media[] + * @since 1.0.0 + */ public array $files = []; /** @@ -72,10 +78,10 @@ class BaseView extends View */ public function render(mixed ...$data) : string { - /** @var array{0:string, 1?:string, 2?:string} $data */ + /** @var array{0:string, 1?:string, 2?:array} $data */ $this->form = $data[0]; $this->virtualPath = $data[1] ?? $this->virtualPath; - $this->files = $data[2] ?? $this->files; + $this->files = $data[2] ?? $this->files; return parent::render(); }