From a4ff1a91f60ddb98ff921ddfd9dd2b3747df0105 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 2 Apr 2024 21:40:47 +0000 Subject: [PATCH] template fixes + bug fixes + style fixes --- Controller/ApiController.php | 8 ++++---- Controller/BackendController.php | 18 +++++++++--------- .../Components/Localization/l11n-view.tpl.php | 2 +- Theme/Backend/page-list.tpl.php | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index cfd7f98..69794fd 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -1426,7 +1426,7 @@ final class ApiController extends Controller /** @var \Modules\Admin\Models\Group[] $groups */ $groups = GroupMapper::getAll() ->where('name', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE') - ->execute(); + ->executeGetArray(); $response->header->set('Content-Type', MimeType::M_JSON, true); $response->set( @@ -1477,7 +1477,7 @@ final class ApiController extends Controller ->where('name1', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE', 'OR') ->where('name2', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE', 'OR') ->where('name3', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE', 'OR') - ->execute(); + ->executeGetArray(); $response->header->set('Content-Type', MimeType::M_JSON, true); $response->set( @@ -1508,7 +1508,7 @@ final class ApiController extends Controller ->where('name1', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE', 'OR') ->where('name2', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE', 'OR') ->where('name3', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE', 'OR') - ->execute(); + ->executeGetArray(); $data = []; @@ -1524,7 +1524,7 @@ final class ApiController extends Controller /** @var Group[] $groups */ $groups = GroupMapper::getAll() ->where('name', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE') - ->execute(); + ->executeGetArray(); foreach ($groups as $group) { /** @var array $temp */ diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 151578d..77699da 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -202,13 +202,13 @@ final class BackendController extends Controller /** @var \Modules\Admin\Models\AccountPermission[] $permissions */ $permissions = AccountPermissionMapper::getAll() ->where('account', (int) $request->getData('id')) - ->execute(); + ->executeGetArray(); $view->data['permissions'] = $permissions; - $view->data['units'] = UnitMapper::getAll()->execute(); - $view->data['apps'] = AppMapper::getAll()->execute(); - $view->data['modules'] = ModuleMapper::getAll()->execute(); + $view->data['units'] = UnitMapper::getAll()->executeGetArray(); + $view->data['apps'] = AppMapper::getAll()->executeGetArray(); + $view->data['modules'] = ModuleMapper::getAll()->executeGetArray(); $accGrpSelector = new \Modules\Admin\Theme\Backend\Components\GroupTagSelector\GroupTagSelectorView($this->app->l11nManager, $request, $response); $view->data['grpSelector'] = $accGrpSelector; @@ -415,13 +415,13 @@ final class BackendController extends Controller /** @var \Modules\Admin\Models\GroupPermission[] $permissions */ $permissions = GroupPermissionMapper::getAll() ->where('group', (int) $request->getData('id')) - ->execute(); + ->executeGetArray(); $view->data['permissions'] = $permissions; - $view->data['units'] = UnitMapper::getAll()->execute(); - $view->data['apps'] = AppMapper::getAll()->execute(); - $view->data['modules'] = ModuleMapper::getAll()->execute(); + $view->data['units'] = UnitMapper::getAll()->executeGetArray(); + $view->data['apps'] = AppMapper::getAll()->executeGetArray(); + $view->data['modules'] = ModuleMapper::getAll()->executeGetArray(); $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); $view->data['accGrpSelector'] = $accGrpSelector; @@ -715,7 +715,7 @@ final class BackendController extends Controller $id = $request->getDataString('id') ?? ''; /** @var \Model\Setting[] $settings */ - $settings = SettingMapper::getAll()->where('module', $id)->execute(); + $settings = SettingMapper::getAll()->where('module', $id)->executeGetArray(); if (empty($settings)) { $view->data['settings'] = $settings; } diff --git a/Theme/Backend/Components/Localization/l11n-view.tpl.php b/Theme/Backend/Components/Localization/l11n-view.tpl.php index d2e08ad..72ded4a 100644 --- a/Theme/Backend/Components/Localization/l11n-view.tpl.php +++ b/Theme/Backend/Components/Localization/l11n-view.tpl.php @@ -6,6 +6,7 @@ use phpOMS\Localization\ISO4217Enum; use phpOMS\Localization\ISO639Enum; use phpOMS\Localization\ISO8601EnumArray; use phpOMS\Localization\TimeZoneEnumArray; +use phpOMS\System\File\Local\Directory; use phpOMS\Uri\UriFactory; use phpOMS\Utils\Converter\AreaType; use phpOMS\Utils\Converter\LengthType; @@ -13,7 +14,6 @@ use phpOMS\Utils\Converter\SpeedType; use phpOMS\Utils\Converter\TemperatureType; use phpOMS\Utils\Converter\VolumeType; use phpOMS\Utils\Converter\WeightType; -use phpOMS\System\File\Local\Directory; $countryCodes = ISO3166TwoEnum::getConstants(); $countries = ISO3166NameEnum::getConstants(); diff --git a/Theme/Backend/page-list.tpl.php b/Theme/Backend/page-list.tpl.php index b215ebe..95ab4fd 100755 --- a/Theme/Backend/page-list.tpl.php +++ b/Theme/Backend/page-list.tpl.php @@ -21,8 +21,8 @@ use phpOMS\Uri\UriFactory; */ $pages = $this->data['pages'] ?? []; -$previous = empty($pages) ? 'admin/page/list' : '{/base}/admin/page/list?{?}&id=' . \reset($pages)->id . '&ptype=p'; -$next = empty($pages) ? 'admin/page/list' : '{/base}/admin/page/list?{?}&id=' . \end($pages)->id . '&ptype=n'; +$previous = empty($pages) ? 'admin/page/list' : '{/base}/admin/page/list?{?}&offset=' . \reset($pages)->id . '&ptype=p'; +$next = empty($pages) ? 'admin/page/list' : '{/base}/admin/page/list?{?}&offset=' . \end($pages)->id . '&ptype=n'; echo $this->data['nav']->render(); ?>