From bd08642f7d76ec1d874ede97003fd1af60200e57 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 12 Apr 2024 00:52:07 +0000 Subject: [PATCH] fix bugs --- Admin/Install/Navigation.install.json | 12 ++-- Admin/Install/SearchCommands.php | 1 + Controller/ApiController.php | 96 +++------------------------ 3 files changed, 17 insertions(+), 92 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 2004dc1..ad7a2a0 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "Wiki", - "uri": "{/base}/wiki/dashboard?{?}", + "uri": "{/base}/wiki/dashboard", "target": "self", "icon": null, "order": 50, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "Dashboard", - "uri": "{/base}/wiki/dashboard?{?}", + "uri": "{/base}/wiki/dashboard", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 3, "subtype": 1, "name": "Categories", - "uri": "{/base}/wiki/category/list?{?}", + "uri": "{/base}/wiki/category/list", "target": "self", "icon": null, "order": 5, @@ -49,7 +49,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/wiki/doc/create?{?}", + "uri": "{/base}/wiki/doc/create", "target": "self", "icon": null, "order": 15, @@ -64,7 +64,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/wiki/doc/list?{?}", + "uri": "{/base}/wiki/doc/list", "target": "self", "icon": null, "order": 10, @@ -79,7 +79,7 @@ "type": 3, "subtype": 1, "name": "Apps", - "uri": "{/base}/wiki/app/list?{?}", + "uri": "{/base}/wiki/app/list", "target": "self", "icon": null, "order": 20, diff --git a/Admin/Install/SearchCommands.php b/Admin/Install/SearchCommands.php index e9378b2..a3343b6 100644 --- a/Admin/Install/SearchCommands.php +++ b/Admin/Install/SearchCommands.php @@ -22,6 +22,7 @@ return [ [ 'dest' => '\Modules\Knowledgebase\Controller\SearchController:searchGeneral', 'verb' => RouteVerb::ANY, + 'active' => true, 'permission' => [ 'module' => SearchController::NAME, 'type' => PermissionType::READ, diff --git a/Controller/ApiController.php b/Controller/ApiController.php index d0e2e3b..cdadae9 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\Knowledgebase\Controller; -use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\NullAccount; use Modules\Editor\Models\EditorDocHistoryMapper; use Modules\Knowledgebase\Models\NullWikiApp; @@ -28,11 +27,6 @@ use Modules\Knowledgebase\Models\WikiDoc; use Modules\Knowledgebase\Models\WikiDocHistory; use Modules\Knowledgebase\Models\WikiDocMapper; use Modules\Knowledgebase\Models\WikiStatus; -use Modules\Media\Models\CollectionMapper; -use Modules\Media\Models\MediaMapper; -use Modules\Media\Models\NullMedia; -use Modules\Media\Models\Reference; -use Modules\Media\Models\ReferenceMapper; use phpOMS\Localization\BaseStringL11n; use phpOMS\Localization\ISO639x1Enum; use phpOMS\Message\Http\RequestStatusCode; @@ -103,98 +97,28 @@ final class ApiController extends Controller { $path = $this->createWikiDir($doc); - /** @var \Modules\Admin\Models\Account $account */ - $account = AccountMapper::get()->where('id', $request->header->account)->execute(); - - $collection = null; - - if (!empty($uploadedFiles = $request->files)) { - $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( + if (!empty($request->files)) { + $this->app->moduleManager->get('Media', 'Api')->uploadFiles( names: [], fileNames: [], - files: $uploadedFiles, + files: $request->files, account: $request->header->account, basePath: __DIR__ . '/../../../Modules/Media/Files' . $path, virtualPath: $path, + rel: $doc->id, + mapper: WikiDocMapper::class, + field: 'files' ); - - foreach ($uploaded as $media) { - $this->createModelRelation( - $request->header->account, - $doc->id, - $media->id, - WikiDocMapper::class, - 'files', - '', - $request->getOrigin() - ); - - $accountPath = '/Accounts/' . $account->id . ' ' . $account->login - . '/Knowledgebase/' . ($doc->category?->id ?? '0') - . '/' . $doc->id; - - $ref = new Reference(); - $ref->name = $media->name; - $ref->source = new NullMedia($media->id); - $ref->createdBy = new NullAccount($request->header->account); - $ref->setVirtualPath($accountPath); - - $this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin()); - - $collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( - $accountPath, - $request->header->account, - __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id . '/Knowledgebase/' . ($doc->category?->id ?? '0') . '/' . $doc->id - ); - - $this->createModelRelation( - $request->header->account, - $collection->id, - $ref->id, - CollectionMapper::class, - 'sources', - '', - $request->getOrigin() - ); - } } - $mediaFiles = $request->getDataJson('media'); - foreach ($mediaFiles as $file) { - /** @var \Modules\Media\Models\Media $media */ - $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute(); - $this->createModelRelation( + if (!empty($media = $request->getDataJson('media'))) { + $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel( $request->header->account, + $media, $doc->id, - $media->id, WikiDocMapper::class, 'files', - '', - $request->getOrigin() - ); - - $ref = new Reference(); - $ref->name = $media->name; - $ref->source = new NullMedia($media->id); - $ref->createdBy = new NullAccount($request->header->account); - $ref->setVirtualPath($path); - - $this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin()); - - $collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( - $path, - $request->header->account, - __DIR__ . '/../../../Modules/Media/Files' . $path - ); - - $this->createModelRelation( - $request->header->account, - $collection->id, - $ref->id, - CollectionMapper::class, - 'sources', - '', - $request->getOrigin() + $path ); } }