From 72b052d52c27994a221ae3ba9c74e057b4e3ee08 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 19 Feb 2022 13:57:39 +0100 Subject: [PATCH] fix name --- Admin/Install/Media.install.json | 0 Admin/Install/Media.php | 6 +++--- Admin/Install/Navigation.php | 6 +++--- Admin/Installer.php | 6 +++--- Admin/Routes/Web/Api.php | 4 ++-- Admin/Routes/Web/Backend.php | 4 ++-- Admin/Status.php | 6 +++--- Admin/Uninstaller.php | 6 +++--- Admin/Updater.php | 6 +++--- CONTRIBUTING.md | 4 ++-- Controller/ApiController.php | 14 ++++++-------- Controller/BackendController.php | 6 +++--- Controller/Controller.php | 6 +++--- Docs/Dev/img/er.png | Bin Models/NullWikiApp.php | 6 +++--- Models/NullWikiCategory.php | 6 +++--- Models/NullWikiDoc.php | 6 +++--- Models/PermissionState.php | 6 +++--- Models/WikiApp.php | 6 +++--- Models/WikiAppMapper.php | 6 +++--- Models/WikiCategory.php | 6 +++--- Models/WikiCategoryL11n.php | 6 +++--- Models/WikiCategoryL11nMapper.php | 6 +++--- Models/WikiCategoryMapper.php | 6 +++--- Models/WikiDoc.php | 6 +++--- Models/WikiDocMapper.php | 6 +++--- Models/WikiStatus.php | 6 +++--- Theme/Backend/Lang/Navigation.ar.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.cs.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.da.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.de.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.el.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.en.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.es.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.fi.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.fr.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.hu.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.it.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.ja.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.ko.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.no.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.pl.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.pt.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.ru.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.sv.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.th.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.tr.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.uk.lang.php | 4 ++-- Theme/Backend/Lang/Navigation.zh.lang.php | 4 ++-- Theme/Backend/Lang/ar.lang.php | 4 ++-- Theme/Backend/Lang/cs.lang.php | 4 ++-- Theme/Backend/Lang/da.lang.php | 4 ++-- Theme/Backend/Lang/de.lang.php | 4 ++-- Theme/Backend/Lang/el.lang.php | 4 ++-- Theme/Backend/Lang/en.lang.php | 4 ++-- Theme/Backend/Lang/es.lang.php | 4 ++-- Theme/Backend/Lang/fi.lang.php | 4 ++-- Theme/Backend/Lang/fr.lang.php | 4 ++-- Theme/Backend/Lang/hu.lang.php | 4 ++-- Theme/Backend/Lang/it.lang.php | 4 ++-- Theme/Backend/Lang/ja.lang.php | 4 ++-- Theme/Backend/Lang/ko.lang.php | 4 ++-- Theme/Backend/Lang/no.lang.php | 4 ++-- Theme/Backend/Lang/pl.lang.php | 4 ++-- Theme/Backend/Lang/pt.lang.php | 4 ++-- Theme/Backend/Lang/ru.lang.php | 4 ++-- Theme/Backend/Lang/sv.lang.php | 4 ++-- Theme/Backend/Lang/th.lang.php | 4 ++-- Theme/Backend/Lang/tr.lang.php | 4 ++-- Theme/Backend/Lang/uk.lang.php | 4 ++-- Theme/Backend/Lang/zh.lang.php | 4 ++-- Theme/Backend/wiki-app-create.tpl.php | 4 ++-- Theme/Backend/wiki-app-list.tpl.php | 4 ++-- Theme/Backend/wiki-app-single.tpl.php | 4 ++-- Theme/Backend/wiki-category-list.tpl.php | 4 ++-- Theme/Backend/wiki-dashboard.tpl.php | 4 ++-- Theme/Backend/wiki-doc-create.tpl.php | 4 ++-- Theme/Backend/wiki-doc-single.tpl.php | 4 ++-- composer.json | 4 ++-- info.json | 2 +- tests/Admin/AdminTest.php | 4 ++-- tests/Autoloader.php | 6 +++--- tests/Controller/ApiControllerTest.php | 4 ++-- tests/Models/NullWikiAppTest.php | 4 ++-- tests/Models/NullWikiCategoryTest.php | 4 ++-- tests/Models/NullWikiDocTest.php | 4 ++-- tests/Models/WikiAppMapperTest.php | 4 ++-- tests/Models/WikiAppTest.php | 4 ++-- tests/Models/WikiCategoryL11nTest.php | 4 ++-- tests/Models/WikiCategoryMapperTest.php | 4 ++-- tests/Models/WikiCategoryTest.php | 4 ++-- tests/Models/WikiDocMapperTest.php | 4 ++-- tests/Models/WikiDocTest.php | 4 ++-- 93 files changed, 207 insertions(+), 209 deletions(-) mode change 100644 => 100755 Admin/Install/Media.install.json mode change 100644 => 100755 Admin/Install/Media.php mode change 100644 => 100755 Docs/Dev/img/er.png mode change 100755 => 100644 Theme/Backend/Lang/Navigation.de.lang.php mode change 100755 => 100644 Theme/Backend/Lang/Navigation.en.lang.php mode change 100755 => 100644 Theme/Backend/Lang/ar.lang.php mode change 100755 => 100644 Theme/Backend/Lang/cs.lang.php mode change 100755 => 100644 Theme/Backend/Lang/da.lang.php mode change 100755 => 100644 Theme/Backend/Lang/de.lang.php mode change 100755 => 100644 Theme/Backend/Lang/el.lang.php mode change 100755 => 100644 Theme/Backend/Lang/en.lang.php mode change 100755 => 100644 Theme/Backend/Lang/es.lang.php mode change 100755 => 100644 Theme/Backend/Lang/fi.lang.php mode change 100755 => 100644 Theme/Backend/Lang/fr.lang.php mode change 100755 => 100644 Theme/Backend/Lang/hu.lang.php mode change 100755 => 100644 Theme/Backend/Lang/it.lang.php mode change 100755 => 100644 Theme/Backend/Lang/ja.lang.php mode change 100755 => 100644 Theme/Backend/Lang/ko.lang.php mode change 100755 => 100644 Theme/Backend/Lang/no.lang.php mode change 100755 => 100644 Theme/Backend/Lang/pl.lang.php mode change 100755 => 100644 Theme/Backend/Lang/pt.lang.php mode change 100755 => 100644 Theme/Backend/Lang/ru.lang.php mode change 100755 => 100644 Theme/Backend/Lang/sv.lang.php mode change 100755 => 100644 Theme/Backend/Lang/th.lang.php mode change 100755 => 100644 Theme/Backend/Lang/tr.lang.php mode change 100755 => 100644 Theme/Backend/Lang/uk.lang.php mode change 100755 => 100644 Theme/Backend/Lang/zh.lang.php diff --git a/Admin/Install/Media.install.json b/Admin/Install/Media.install.json old mode 100644 new mode 100755 diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php old mode 100644 new mode 100755 index b8c70f9..ca72ba1 --- a/Admin/Install/Media.php +++ b/Admin/Install/Media.php @@ -1,6 +1,6 @@ source = new NullMedia($media->getId()); $ref->createdBy = new NullAccount($request->header->account); - $ref->setVirtualPath($accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login . '/Knowledgebase/' . $doc->createdAt->format('Y') . '/' . $doc->createdAt->format('m') . '/' . $doc->getId()); + $ref->setVirtualPath($accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login . '/Knowledgebase/' . $doc->category->getId() . '/' . $doc->getId()); ReferenceMapper::create()->execute($ref); @@ -119,7 +119,7 @@ final class ApiController extends Controller '/Modules/Media/Files', $accountPath, $request->header->account, - __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/Knowledgebase/' . $doc->createdAt->format('Y') . '/' . $doc->createdAt->format('m') . '/' . $doc->getId() + __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/Knowledgebase/' . $doc->category->getId() . '/' . $doc->getId() ); } @@ -157,9 +157,7 @@ final class ApiController extends Controller private function createWikiDir(WikiDoc $doc) : string { return '/Modules/Knowledgebase/' - . $doc->createdAt->format('Y') . '/' - . $doc->createdAt->format('m') . '/' - . $doc->createdAt->format('d') . '/' + . $doc->category->getId() . '/' . $doc->getId(); } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 06be3de..f13f358 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -1,6 +1,6 @@