Jingga/oms-OnlineResourceWatcher
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-OnlineResourceWatcher.git synced 2026-02-06 19:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Karaka-Management/oms-OnlineResourceWatcher into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:58:37 +00:00
commit d94017e924
4 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/ApiController.php
View File

@ -143,7 +143,7 @@ final class ApiController extends Controller
public function apiResourceCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateResourceCreate($request))) {
$response->set('resource_create', new FormValidation($val));
$response->data['resource_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -566,7 +566,7 @@ final class ApiController extends Controller
$mail = clone $baseEmail;
$mail->setFrom($emailSettings->content);
$mailL11n = $baseEmail->getL11nByLanguage($resource->owner->l11n->getLanguage());
$mailL11n = $baseEmail->getL11nByLanguage($resource->owner->l11n->language);
if ($mailL11n->id === 0) {
$mailL11n = $baseEmail->getL11nByLanguage($this->app->l11nServer->getLanguage());
}
@ -657,7 +657,7 @@ final class ApiController extends Controller
public function apiResourceUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateResourceUpdate($request))) {
$response->set('resource_create', new FormValidation($val));
$response->data['resource_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -750,7 +750,7 @@ final class ApiController extends Controller
public function apiResourceDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateResourceDelete($request))) {
$response->set('resource_create', new FormValidation($val));
$response->data['resource_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -808,7 +808,7 @@ final class ApiController extends Controller
public function apiInformCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateInformCreate($request))) {
$response->set('resource_inform_create', new FormValidation($val));
$response->data['resource_inform_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -886,7 +886,7 @@ final class ApiController extends Controller
public function apiInformDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateInformDelete($request))) {
$response->set('resource_create', new FormValidation($val));
$response->data['resource_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;

8
Controller/BackendController.php
View File

@ -82,7 +82,7 @@ final class BackendController extends Controller
}
$pageLimit = 25;
$view->addData('pageLimit', $pageLimit);
$view->data['pageLimit'] = $pageLimit;
$mapper = ResourceMapper::getAll()->with('createdBy');
$list = ResourceMapper::find(
@ -98,7 +98,7 @@ final class BackendController extends Controller
filters: $filterField
);
$view->setData('resources', $list['data']);
$view->data['resources'] = $list['data'];
$tableView = new TableView($this->app->l11nManager, $request, $response);
$tableView->module = 'OnlineResourceWatcher';
@ -110,7 +110,7 @@ final class BackendController extends Controller
$tableView->setData('hasPrevious', $list['hasPrevious']);
$tableView->setData('hasNext', $list['hasNext']);
$view->addData('tableView', $tableView);
$view->data['tableView'] = $tableView;
return $view;
}
@ -139,7 +139,7 @@ final class BackendController extends Controller
->limit(25, 'reports')
->execute();
$view->setData('resource', $resource);
$view->data['resource'] = $resource;
return $view;
}

12
Models/Resource.php
View File

@ -159,18 +159,6 @@ class Resource implements \JsonSerializable
$this->createdAt = new \DateTimeImmutable('now');
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* {@inheritdoc}
*/

4
Theme/Backend/resource-list.tpl.php
View File

@ -18,9 +18,9 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\OnlineResourceWatcher\Models\Resource[] $resources
*/
$resources = $this->getData('resources') ?? [];
$resources = $this->data['resources'] ?? [];
$tableView = $this->getData('tableView');
$tableView = $this->data['tableView'];
$tableView->id = 'resourceList';
$tableView->baseUri = '{/prefix}orw/resource/list';
$tableView->setObjects($resources);