diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 03a8caf..1b68592 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -17,6 +17,7 @@ namespace Modules\Editor\Controller; use Modules\Admin\Models\NullAccount; use Modules\Editor\Models\EditorDoc; use Modules\Editor\Models\EditorDocMapper; +use Modules\Media\Models\PathSettings; use Modules\Tag\Models\NullTag; use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\RequestStatusCode; @@ -25,7 +26,6 @@ use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; use phpOMS\Utils\Parser\Markdown\Markdown; -use Modules\Media\Models\PathSettings; /** * Calendar controller class. diff --git a/Models/EditorDoc.php b/Models/EditorDoc.php index 35253de..dc4bbbd 100755 --- a/Models/EditorDoc.php +++ b/Models/EditorDoc.php @@ -15,8 +15,8 @@ declare(strict_types=1); namespace Modules\Editor\Models; use Modules\Admin\Models\Account; -use Modules\Media\Models\Media; use Modules\Admin\Models\NullAccount; +use Modules\Media\Models\Media; use Modules\Tag\Models\Tag; use phpOMS\Contract\ArrayableInterface; diff --git a/Models/EditorDocMapper.php b/Models/EditorDocMapper.php index 1b86168..9cbfc16 100755 --- a/Models/EditorDocMapper.php +++ b/Models/EditorDocMapper.php @@ -15,10 +15,10 @@ declare(strict_types=1); namespace Modules\Editor\Models; use Modules\Admin\Models\AccountMapper; +use Modules\Media\Models\MediaMapper; use Modules\Tag\Models\TagMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\RelationType; -use Modules\Media\Models\MediaMapper; /** * Editor doc mapper class. diff --git a/Theme/Backend/editor-list.tpl.php b/Theme/Backend/editor-list.tpl.php index eb2ff50..60db02b 100755 --- a/Theme/Backend/editor-list.tpl.php +++ b/Theme/Backend/editor-list.tpl.php @@ -23,7 +23,7 @@ $docs = $this->getData('docs'); /** @var \Modules\Media\Models\Collection[] */ $collections = $this->getData('collections'); $mediaPath = \urldecode($this->getData('path') ?? '/'); -$account = $this->getData('account'); +$account = $this->getData('account'); $accountDir = $account->getId() . ' ' . $account->login; @@ -40,9 +40,9 @@ echo $this->getData('nav')->render(); ?>
  • /
  • getData('doc'); +$doc = $this->getData('doc'); $files = $doc->getMedia(); /** @var bool $editable */