todo implementations

This commit is contained in:
Dennis Eichhorn 2021-11-20 17:10:10 +01:00
parent 7a8bdeeaa2
commit c1d1da8929
2 changed files with 25 additions and 21 deletions

View File

@ -14,8 +14,8 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
$nav = $this->getData('nav'); $nav = $this->getData('nav-element');
$routes = $this->getData('routes'); $routes = $this->getData('routes') ?? [];
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
@ -29,12 +29,12 @@ echo $this->getData('nav')->render(); ?>
<div class="portlet-body"> <div class="portlet-body">
<div class="form-group"> <div class="form-group">
<label for="iId"><?= $this->getHtml('Id'); ?></label> <label for="iId"><?= $this->getHtml('Id'); ?></label>
<input id="iId" name="id" type="text" value="<?= $this->printHtml($nav->id); ?>"> <input id="iId" name="id" type="text" value="<?= $this->printHtml((string) $nav->id); ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iApp"><?= $this->getHtml('App'); ?></label> <label for="iApp"><?= $this->getHtml('App'); ?></label>
<input id="iApp" name="app" type="text" value="<?= $this->printHtml($nav->app); ?>"> <input id="iApp" name="app" type="text" value="<?= $this->printHtml((string) $nav->app); ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
@ -49,17 +49,17 @@ echo $this->getData('nav')->render(); ?>
<div class="form-group"> <div class="form-group">
<label for="iType"><?= $this->getHtml('Type'); ?></label> <label for="iType"><?= $this->getHtml('Type'); ?></label>
<input id="iType" name="type" type="text" value="<?= $this->printHtml($nav->type); ?>"> <input id="iType" name="type" type="text" value="<?= $this->printHtml((string) $nav->type); ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iSubtype"><?= $this->getHtml('Subtype'); ?></label> <label for="iSubtype"><?= $this->getHtml('Subtype'); ?></label>
<input id="iSubtype" name="subtype" type="text" value="<?= $this->printHtml($nav->subtype); ?>"> <input id="iSubtype" name="subtype" type="text" value="<?= $this->printHtml((string) $nav->subtype); ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iLinkStatus"><?= $this->getHtml('LinkStatus'); ?></label> <label for="iLinkStatus"><?= $this->getHtml('LinkStatus'); ?></label>
<input id="iLinkStatus" name="status" type="text" value="<?= $this->printHtml($nav->status); ?>"> <input id="iLinkStatus" name="status" type="text" value="<?= $this->printHtml((string) $nav->status); ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
@ -74,22 +74,22 @@ echo $this->getData('nav')->render(); ?>
<div class="form-group"> <div class="form-group">
<label for="iParent"><?= $this->getHtml('Parent'); ?></label> <label for="iParent"><?= $this->getHtml('Parent'); ?></label>
<input id="iParent" name="parent" type="text" value="<?= $this->printHtml($nav->parent); ?>"> <input id="iParent" name="parent" type="text" value="<?= $this->printHtml((string) $nav->parent); ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iOrder"><?= $this->getHtml('Order'); ?></label> <label for="iOrder"><?= $this->getHtml('Order'); ?></label>
<input id="iOrder" name="order" type="text" value="<?= $this->printHtml($nav->order); ?>"> <input id="iOrder" name="order" type="text" value="<?= $this->printHtml((string) $nav->order); ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iPermission"><?= $this->getHtml('Permission'); ?></label> <label for="iPermission"><?= $this->getHtml('Permission'); ?></label>
<input id="iPermission" name="permPerm" type="text" value="<?= $this->printHtml($nav->permissionPerm); ?>"> <input id="iPermission" name="permPerm" type="text" value="<?= $this->printHtml((string) $nav->permissionPerm); ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iPermissionType"><?= $this->getHtml('PermissionType'); ?></label> <label for="iPermissionType"><?= $this->getHtml('PermissionType'); ?></label>
<input id="iPermissionType" name="permType" type="text" value="<?= $this->printHtml($nav->permissionType); ?>"> <input id="iPermissionType" name="permType" type="text" value="<?= $this->printHtml((string) $nav->permissionType); ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
@ -198,8 +198,8 @@ echo $this->getData('nav')->render(); ?>
</table> </table>
</div> </div>
<div class="portlet-foot"> <div class="portlet-foot">
<a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a> <a tabindex="0" class="button" href="<?= UriFactory::build($previous ?? ''); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
<a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a> <a tabindex="0" class="button" href="<?= UriFactory::build($next ?? ''); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
</div> </div>
</div> </div>
</div> </div>

View File

@ -47,9 +47,10 @@ final class BackendController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function createNavigationMid(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView public function createNavigationMid(int $pageId, RequestAbstract $request, ResponseAbstract $response): NavigationView
{ {
$nav = Navigation::getInstance($request, $nav = Navigation::getInstance(
$request,
$this->app->accountManager->get($request->header->account), $this->app->accountManager->get($request->header->account),
$this->app->dbPool, $this->app->dbPool,
$this->app->orgId, $this->app->orgId,
@ -75,7 +76,7 @@ final class BackendController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function getView(RequestAbstract $request, ResponseAbstract $response) : NavigationView public function getView(RequestAbstract $request, ResponseAbstract $response): NavigationView
{ {
$navObj = Navigation::getInstance( $navObj = Navigation::getInstance(
$request, $request,
@ -109,7 +110,7 @@ final class BackendController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function loadLanguage(RequestAbstract $request, ResponseAbstract $response) : void public function loadLanguage(RequestAbstract $request, ResponseAbstract $response): void
{ {
$languages = $this->app->moduleManager->getLanguageFiles($request); $languages = $this->app->moduleManager->getLanguageFiles($request);
$langCode = $response->getLanguage(); $langCode = $response->getLanguage();
@ -138,9 +139,10 @@ final class BackendController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function createNavigationSplash(int $pageId, RequestAbstract $request, ResponseAbstract $response) : NavigationView public function createNavigationSplash(int $pageId, RequestAbstract $request, ResponseAbstract $response): NavigationView
{ {
$nav = Navigation::getInstance($request, $nav = Navigation::getInstance(
$request,
$this->app->accountManager->get($request->header->account), $this->app->accountManager->get($request->header->account),
$this->app->dbPool, $this->app->dbPool,
$this->app->orgId, $this->app->orgId,
@ -167,7 +169,7 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, $data = null): RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
@ -202,12 +204,14 @@ final class BackendController extends Controller
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function viewModuleNavElementSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewModuleNavElementSettings(RequestAbstract $request, ResponseAbstract $response, $data = null): RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-nav'); $view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings-nav');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
$view->addData('nav-element', NavElementMapper::get((int) $request->getData('nav'))); $view->addData('nav-element', NavElementMapper::get((int) $request->getData('nav')));
return $view;
} }
} }