diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index cabb124..a8da82e 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -90,7 +90,7 @@ final class ApiController extends Controller
public function apiTicketCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateTicketCreate($request))) {
- $response->set($request->uri->__toString(), new FormValidation($val));
+ $response->data[$request->uri->__toString()] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@@ -226,7 +226,7 @@ final class ApiController extends Controller
public function apiTicketElementCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateTicketElementCreate($request))) {
- $response->set('ticket_element_create', new FormValidation($val));
+ $response->data['ticket_element_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@@ -349,7 +349,7 @@ final class ApiController extends Controller
public function apiSupportAppCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateSupportAppCreate($request))) {
- $response->set('qa_app_create', new FormValidation($val));
+ $response->data['qa_app_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@@ -414,7 +414,7 @@ final class ApiController extends Controller
public function apiTicketAttributeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateTicketAttributeCreate($request))) {
- $response->set('attribute_create', new FormValidation($val));
+ $response->data['attribute_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@@ -491,7 +491,7 @@ final class ApiController extends Controller
public function apiTicketAttributeTypeL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateTicketAttributeTypeL11nCreate($request))) {
- $response->set('attr_type_l11n_create', new FormValidation($val));
+ $response->data['attr_type_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@@ -516,7 +516,7 @@ final class ApiController extends Controller
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('type') ?? 0;
$attrL11n->setLanguage(
- $request->getDataString('language') ?? $request->getLanguage()
+ $request->getDataString('language') ?? $request->header->l11n->language
);
$attrL11n->content = $request->getDataString('title') ?? '';
@@ -560,7 +560,7 @@ final class ApiController extends Controller
public function apiTicketAttributeTypeCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateTicketAttributeTypeCreate($request))) {
- $response->set('attr_type_create', new FormValidation($val));
+ $response->data['attr_type_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@@ -627,7 +627,7 @@ final class ApiController extends Controller
public function apiTicketAttributeValueCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateTicketAttributeValueCreate($request))) {
- $response->set('attr_value_create', new FormValidation($val));
+ $response->data['attr_value_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@@ -712,7 +712,7 @@ final class ApiController extends Controller
public function apiTicketAttributeValueL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateTicketAttributeValueL11nCreate($request))) {
- $response->set('attr_value_l11n_create', new FormValidation($val));
+ $response->data['attr_value_l11n_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@@ -737,7 +737,7 @@ final class ApiController extends Controller
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('value') ?? 0;
$attrL11n->setLanguage(
- $request->getDataString('language') ?? $request->getLanguage()
+ $request->getDataString('language') ?? $request->header->l11n->language
);
$attrL11n->content = $request->getDataString('title') ?? '';
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 415872b..85aae8e 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -68,12 +68,12 @@ final class BackendController extends Controller
*/
public function viewSupportList(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{
- $head = $response->get('Content')->getData('head');
+ $head = $response->get('Content')->head;
$head->addAsset(AssetType::CSS, 'Modules/Tasks/Theme/Backend/css/styles.css?v=1.0.0');
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Support/Theme/Backend/support-list');
- $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response));
+ $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response);
$mapperQuery = TicketMapper::getAll()
->with('task')
@@ -83,17 +83,11 @@ final class BackendController extends Controller
->limit(25);
if ($request->getData('ptype') === 'p') {
- $view->setData('tickets',
- $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<')->execute()
- );
+ $view->data['tickets'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<')->execute();
} elseif ($request->getData('ptype') === 'n') {
- $view->setData('tickets',
- $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>')->execute()
- );
+ $view->data['tickets'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>')->execute();
} else {
- $view->setData('tickets',
- $mapperQuery->where('id', 0, '>')->execute()
- );
+ $view->data['tickets'] = $mapperQuery->where('id', 0, '>')->execute();
}
return $view;
@@ -116,7 +110,7 @@ final class BackendController extends Controller
$view = new TicketView($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Support/Theme/Backend/support-ticket');
- $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response));
+ $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response);
$mapperQuery = TicketMapper::get()
->with('task')
@@ -130,20 +124,20 @@ final class BackendController extends Controller
->with('attributes')
->with('for')
->with('app')
- ->where('task/tags/title/language', $request->getLanguage());
+ ->where('task/tags/title/language', $request->header->l11n->language);
/** @var \Modules\Support\Models\Ticket $ticket */
$ticket = $request->hasData('for')
? $mapperQuery->where('task', (int) $request->getData('for'))->execute()
: $mapperQuery->where('id', (int) $request->getData('id'))->execute();
- $view->addData('ticket', $ticket);
+ $view->data['ticket'] = $ticket;
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
- $view->addData('accGrpSelector', $accGrpSelector);
+ $view->data['accGrpSelector'] = $accGrpSelector;
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
- $view->addData('editor', $editor);
+ $view->data['editor'] = $editor;
return $view;
}
@@ -164,7 +158,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Support/Theme/Backend/ticket-create');
- $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response));
+ $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response);
return $view;
}
@@ -185,7 +179,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Support/Theme/Backend/support-analysis');
- $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response));
+ $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response);
return $view;
}
@@ -206,7 +200,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Support/Theme/Backend/support-settings');
- $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response));
+ $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response);
return $view;
}
@@ -227,7 +221,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Support/Theme/Backend/user-support-dashboard');
- $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response));
+ $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1002901101, $request, $response);
return $view;
}
@@ -246,16 +240,16 @@ final class BackendController extends Controller
public function viewModuleSettings(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{
$view = new View($this->app->l11nManager, $request, $response);
- $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response));
+ $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
$id = $request->getDataString('id') ?? '';
$settings = SettingMapper::getAll()->where('module', $id)->execute();
- $view->setData('settings', $settings);
+ $view->data['settings'] = $settings;
/** @var \Modules\Support\Models\SupportApp[] $applications */
$applications = SupportAppMapper::getAll()->execute();
- $view->setData('applications', $applications);
+ $view->data['applications'] = $applications;
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
diff --git a/Models/TicketAttribute.php b/Models/TicketAttribute.php
index c7e806f..9fe1c55 100755
--- a/Models/TicketAttribute.php
+++ b/Models/TicketAttribute.php
@@ -67,18 +67,6 @@ class TicketAttribute implements \JsonSerializable
$this->value = new TicketAttributeValue();
}
- /**
- * Get id
- *
- * @return int
- *
- * @since 1.0.0
- */
- public function getId() : int
- {
- return $this->id;
- }
-
/**
* {@inheritdoc}
*/
diff --git a/Models/TicketAttributeType.php b/Models/TicketAttributeType.php
index a2b2da9..77e981a 100755
--- a/Models/TicketAttributeType.php
+++ b/Models/TicketAttributeType.php
@@ -97,18 +97,6 @@ class TicketAttributeType implements \JsonSerializable
$this->setL11n($name);
}
- /**
- * Get id
- *
- * @return int
- *
- * @since 1.0.0
- */
- public function getId() : int
- {
- return $this->id;
- }
-
/**
* Set l11n
*
diff --git a/Models/TicketAttributeValue.php b/Models/TicketAttributeValue.php
index 712f215..2003fb5 100755
--- a/Models/TicketAttributeValue.php
+++ b/Models/TicketAttributeValue.php
@@ -108,17 +108,6 @@ class TicketAttributeValue implements \JsonSerializable
*/
private ?BaseStringL11n $l11n = null;
- /**
- * Get id
- *
- * @return int
- *
- * @since 1.0.0
- */
- public function getId() : int
- {
- return $this->id;
- }
/**
* Set value
diff --git a/Models/TicketElement.php b/Models/TicketElement.php
index 653100b..e877fea 100755
--- a/Models/TicketElement.php
+++ b/Models/TicketElement.php
@@ -70,18 +70,6 @@ class TicketElement implements \JsonSerializable
$this->taskElement = $taskElement ?? new TaskElement();
}
- /**
- * Get id
- *
- * @return int
- *
- * @since 1.0.0
- */
- public function getId() : int
- {
- return $this->id;
- }
-
/**
* {@inheritdoc}
*/
diff --git a/Theme/Backend/support-list.tpl.php b/Theme/Backend/support-list.tpl.php
index 668f038..4568a66 100755
--- a/Theme/Backend/support-list.tpl.php
+++ b/Theme/Backend/support-list.tpl.php
@@ -18,9 +18,9 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\Support\Models\Ticket[] $tickets
*/
-$tickets = $this->getData('tickets');
+$tickets = $this->data['tickets'];
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/support-ticket.tpl.php b/Theme/Backend/support-ticket.tpl.php
index 9df96ec..f85be36 100755
--- a/Theme/Backend/support-ticket.tpl.php
+++ b/Theme/Backend/support-ticket.tpl.php
@@ -22,14 +22,14 @@ use phpOMS\Uri\UriFactory;
* @var \Modules\Support\Vies\TicketView $this
* @var \Modules\Support\Models\Ticket $ticket
*/
-$ticket = $this->getData('ticket');
+$ticket = $this->data['ticket'];
$task = $ticket->task;
$taskMedia = $task->getMedia();
$elements = $ticket->invertTicketElements();
$cElements = \count($elements);
$color = 'red'; //$this->getStatus($task->getStatus());
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/ticket-create.tpl.php b/Theme/Backend/ticket-create.tpl.php
index bc6c58d..91764a0 100755
--- a/Theme/Backend/ticket-create.tpl.php
+++ b/Theme/Backend/ticket-create.tpl.php
@@ -15,7 +15,7 @@ declare(strict_types=1);
/**
* @var \phpOMS\Views\View $this
*/
-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>