From d62c0ddbe93900d1bad23db37dd89705d1012a61 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 4 Apr 2021 17:10:52 +0200 Subject: [PATCH] many fixes and expands and module expansions --- Controller/ApiController.php | 2 ++ Controller/BackendController.php | 1 + Theme/Backend/helper-create.tpl.php | 2 +- Theme/Backend/helper-list.tpl.php | 32 +++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index ab9970c..3a1b1a4 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -346,6 +346,7 @@ final class ApiController extends Controller $this->app->orgId, $this->app->appName, self::MODULE_NAME, + self::MODULE_NAME, PermissionState::TEMPLATE, $template->getId(), null, @@ -456,6 +457,7 @@ final class ApiController extends Controller $this->app->orgId, $this->app->appName, self::MODULE_NAME, + self::MODULE_NAME, PermissionState::REPORT, $report->getId(), null, diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 88821af..0343e1f 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -66,6 +66,7 @@ final class BackendController extends Controller $view->addData('collections', $collection); $view->addData('path', $path); $view->addData('reports', $templates); + $view->addData('account', $this->app->accountManager->get($request->header->account)); return $view; } diff --git a/Theme/Backend/helper-create.tpl.php b/Theme/Backend/helper-create.tpl.php index 7549531..5e5e551 100755 --- a/Theme/Backend/helper-create.tpl.php +++ b/Theme/Backend/helper-create.tpl.php @@ -34,7 +34,7 @@ echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/helper-list.tpl.php b/Theme/Backend/helper-list.tpl.php index d1a0f35..7c3d5b6 100755 --- a/Theme/Backend/helper-list.tpl.php +++ b/Theme/Backend/helper-list.tpl.php @@ -19,6 +19,9 @@ use phpOMS\Uri\UriFactory; * @var \Modules\Helper\Models\Template[] $templates */ $templates = $this->getData('reports'); +$account = $this->getData('account'); + +$accountDir = $account->getId() . ' ' . $account->login; /** @var \Modules\Media\Models\Collection[] */ $collections = $this->getData('collections'); @@ -32,17 +35,23 @@ echo $this->getData('nav')->render(); ?>
    +
  • /
  • getData('nav')->render(); ?> + + + + + +
    getHtml('Name'); ?>
    + + .. + + + + + + $value) : ++$count; $url = UriFactory::build('{/prefix}helper/list?path=' . \rtrim($value->getVirtualPath(), '/') . '/' . $value->name); ?>
    printHtml($value->name); ?> @@ -124,6 +152,10 @@ echo $this->getData('nav')->render(); ?> $template) : ++$count; $url = UriFactory::build('{/prefix}helper/report/view?{?}&id=' . $template->getId()); ?>
    printHtml($template->name); ?>