Continue with getter/setter cleanup

This commit is contained in:
Dennis Eichhorn 2023-05-30 15:44:14 +02:00
parent 63fe2b7a03
commit 754cc47ce6
4 changed files with 12 additions and 12 deletions

View File

@ -51,7 +51,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Auditor/Theme/Backend/audit-list'); $view->setTemplate('/Modules/Auditor/Theme/Backend/audit-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response);
$searchFieldData = $request->getLike('.*\-p\-.*'); $searchFieldData = $request->getLike('.*\-p\-.*');
$searchField = []; $searchField = [];
@ -84,7 +84,7 @@ final class BackendController extends Controller
} }
$pageLimit = 25; $pageLimit = 25;
$view->addData('pageLimit', $pageLimit); $view->data['pageLimit'] = $pageLimit;
$mapper = AuditMapper::getAll()->with('createdBy'); $mapper = AuditMapper::getAll()->with('createdBy');
@ -102,7 +102,7 @@ final class BackendController extends Controller
filters: $filterField filters: $filterField
); );
$view->setData('audits', $list['data']); $view->data['audits'] = $list['data'];
/** @var \Model\Setting[] $exportTemplates */ /** @var \Model\Setting[] $exportTemplates */
$exportTemplates = $this->app->appSettings->get( $exportTemplates = $this->app->appSettings->get(
@ -132,7 +132,7 @@ final class BackendController extends Controller
$tableView->setData('hasPrevious', $list['hasPrevious']); $tableView->setData('hasPrevious', $list['hasPrevious']);
$tableView->setData('hasNext', $list['hasNext']); $tableView->setData('hasNext', $list['hasNext']);
$view->addData('tableView', $tableView); $view->data['tableView'] = $tableView;
return $view; return $view;
} }
@ -153,7 +153,7 @@ final class BackendController extends Controller
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Auditor/Theme/Backend/audit-single'); $view->setTemplate('/Modules/Auditor/Theme/Backend/audit-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response);
/** @var \Modules\Auditor\Models\Audit $audit */ /** @var \Modules\Auditor\Models\Audit $audit */
$audit = AuditMapper::get() $audit = AuditMapper::get()
@ -161,7 +161,7 @@ final class BackendController extends Controller
->where('id', (int) $request->getData('id')) ->where('id', (int) $request->getData('id'))
->execute(); ->execute();
$view->setData('audit', $audit); $view->data['audit'] = $audit;
return $view; return $view;
} }

View File

@ -118,7 +118,7 @@ final class CliController extends Controller
} }
} }
$view->setData('count', $count); $view->data['count'] = $count;
return $view; return $view;
} }

View File

@ -18,9 +18,9 @@ use phpOMS\Uri\UriFactory;
* @var \Web\Backend\Views\TableView $this * @var \Web\Backend\Views\TableView $this
* @var \Modules\Audit\Models\Audit[] $audits * @var \Modules\Audit\Models\Audit[] $audits
*/ */
$audits = $this->getData('audits') ?? []; $audits = $this->data['audits'] ?? [];
$tableView = $this->getData('tableView'); $tableView = $this->data['tableView'];
$tableView->id = 'auditList'; $tableView->id = 'auditList';
$tableView->baseUri = '{/base}/admin/audit/list'; $tableView->baseUri = '{/base}/admin/audit/list';
$tableView->exportUri = '{/api}auditor/list/export'; $tableView->exportUri = '{/api}auditor/list/export';
@ -37,7 +37,7 @@ $next = $tableView->getNextLink(
$this->getData('hasNext') ?? false $this->getData('hasNext') ?? false
); );
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">

View File

@ -19,11 +19,11 @@ use phpOMS\Views\ViewAbstract;
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
/** @var \Modules\Auditor\Models\Audit $audit */ /** @var \Modules\Auditor\Models\Audit $audit */
$audit = $this->getData('audit'); $audit = $this->data['audit'];
$headers = HttpHeader::getAllHeaders(); $headers = HttpHeader::getAllHeaders();
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); echo $this->data['nav']->render();
?> ?>
<?php if (isset($headers['Referer'])) : ?> <?php if (isset($headers['Referer'])) : ?>