Jingga/oms-Editor
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Editor.git synced 2026-02-15 17:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Continue with getter/setter cleanup

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 15:44:17 +02:00
parent 4933832530
commit 4eb1a5b752
5 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Controller/ApiController.php
View File

@ -690,10 +690,10 @@ final class ApiController extends Controller
->where('id', (int) $settings[AdminSettingsEnum::DEFAULT_ASSETS]->content) ->where('id', (int) $settings[AdminSettingsEnum::DEFAULT_ASSETS]->content)
->execute(); ->execute();
$view->setData('defaultTemplates', $defaultTemplates); $view->data['defaultTemplates'] = $defaultTemplates;
$view->setData('defaultAssets', $defaultAssets); $view->data['defaultAssets'] = $defaultAssets;
$view->setData('pdf', $pdf); $view->data['pdf'] = $pdf;
$view->setData('doc', $doc); $view->data['doc'] = $doc;
$response->set('', $view->render()); $response->set('', $view->render());

41
Controller/BackendController.php
View File

@ -50,7 +50,7 @@ final class BackendController extends Controller
*/ */
public function setUpEditorEditor(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function setUpEditorEditor(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
$head = $response->get('Content')->getData('head'); $head = $response->get('Content')->head;
$head->addAsset(AssetType::JSLATE, 'Modules/Editor/Controller.js', ['type' => 'module']); $head->addAsset(AssetType::JSLATE, 'Modules/Editor/Controller.js', ['type' => 'module']);
} }
@ -71,13 +71,13 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Editor/Theme/Backend/editor-create'); $view->setTemplate('/Modules/Editor/Theme/Backend/editor-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor); $view->data['editor'] = $editor;
$tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response); $tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('tagSelector', $tagSelector); $view->data['tagSelector'] = $tagSelector;
return $view; return $view;
} }
@ -99,18 +99,18 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Editor/Theme/Backend/editor-list'); $view->setTemplate('/Modules/Editor/Theme/Backend/editor-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response);
$path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/')); $path = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/'));
$docs = EditorDocMapper::getByVirtualPath($path, $request->header->account)->where('tags/title/language', $response->header->l11n->language)->execute(); $docs = EditorDocMapper::getByVirtualPath($path, $request->header->account)->where('tags/title/language', $response->header->l11n->language)->execute();
list($collection, $parent) = CollectionMapper::getCollectionsByPath($path); list($collection, $parent) = CollectionMapper::getCollectionsByPath($path);
$view->addData('parent', $parent); $view->data['parent'] = $parent;
$view->addData('collections', $collection); $view->data['collections'] = $collection;
$view->addData('path', $path); $view->data['path'] = $path;
$view->addData('docs', $docs); $view->data['docs'] = $docs;
$view->addData('account', $this->app->accountManager->get($request->header->account)); $view->data['account'] = $this->app->accountManager->get($request->header->account);
return $view; return $view;
} }
@ -152,18 +152,17 @@ final class BackendController extends Controller
} }
$view->setTemplate('/Modules/Editor/Theme/Backend/editor-single'); $view->setTemplate('/Modules/Editor/Theme/Backend/editor-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response);
$view->addData('doc', $doc); $view->data['doc'] = $doc;
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor); $view->data['editor'] = $editor;
$tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response); $tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('tagSelector', $tagSelector); $view->data['tagSelector'] = $tagSelector;
$view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( $view->data['editable'] = $this->app->accountManager->get($accountId)->hasPermission(
PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::DOC, $doc->id) PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::DOC, $doc->id);
);
return $view; return $view;
} }
@ -198,14 +197,14 @@ final class BackendController extends Controller
} }
$view->setTemplate('/Modules/Editor/Theme/Backend/editor-create'); $view->setTemplate('/Modules/Editor/Theme/Backend/editor-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response);
$view->addData('doc', $doc); $view->data['doc'] = $doc;
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor); $view->data['editor'] = $editor;
$tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response); $tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('tagSelector', $tagSelector); $view->data['tagSelector'] = $tagSelector;
return $view; return $view;
} }

2
Theme/Backend/editor-create.tpl.php
View File

@ -20,7 +20,7 @@ $doc = $this->getData('doc') ?? new NullEditorDoc();
$isNewDoc = $doc->id === 0; $isNewDoc = $doc->id === 0;
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-8"> <div class="col-xs-12 col-md-8">

10
Theme/Backend/editor-list.tpl.php
View File

@ -18,21 +18,21 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
* @var \Modules\Editor\Models\EditorDoc[] $docs * @var \Modules\Editor\Models\EditorDoc[] $docs
*/ */
$docs = $this->getData('docs') ?? []; $docs = $this->data['docs'] ?? [];
/** @var \Modules\Media\Models\Collection[] */ /** @var \Modules\Media\Models\Collection[] */
$collections = $this->getData('collections'); $collections = $this->data['collections'];
$mediaPath = \urldecode($this->getData('path') ?? '/'); $mediaPath = \urldecode($this->getData('path') ?? '/');
$account = $this->getData('account'); $account = $this->data['account'];
$accountDir = $account->id . ' ' . $account->login; $accountDir = $account->id . ' ' . $account->login;
$previous = empty($docs) ? '{/base}/editor/list' : '{/base}/editor/list?{?}&id=' . \reset($docs)->id . '&ptype=p'; $previous = empty($docs) ? '{/base}/editor/list' : '{/base}/editor/list?{?}&id=' . \reset($docs)->id . '&ptype=p';
$next = empty($docs) ? '{/base}/editor/list' : '{/base}/editor/list?{?}&id=' . \end($docs)->id . '&ptype=n'; $next = empty($docs) ? '{/base}/editor/list' : '{/base}/editor/list?{?}&id=' . \end($docs)->id . '&ptype=n';
$docs = $this->getData('docs'); $docs = $this->data['docs'];
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="box"> <div class="box">

6
Theme/Backend/editor-single.tpl.php
View File

@ -16,17 +16,17 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** @var \Modules\Editor\Models\EditorDoc $doc */ /** @var \Modules\Editor\Models\EditorDoc $doc */
$doc = $this->getData('doc'); $doc = $this->data['doc'];
$files = $doc->getMedia(); $files = $doc->getMedia();
/** @var bool $editable */ /** @var bool $editable */
$editable = $this->getData('editable'); $editable = $this->data['editable'];
/** @var \Modules\Tag\Models\Tag[] $tag */ /** @var \Modules\Tag\Models\Tag[] $tag */
$tags = $doc->getTags(); $tags = $doc->getTags();
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<section class="portlet"> <section class="portlet">