From f778c96e28ba91cc23d0ba8c880068ca5dec1c26 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 7 Apr 2024 17:31:41 +0000 Subject: [PATCH] ui fixes --- Admin/Routes/Web/Api.php | 6 ++++++ Admin/Routes/Web/Backend.php | 11 +++++++++++ Controller/ApiAttributeController.php | 2 +- Controller/ApiContractTypeController.php | 12 ++++++------ Controller/ApiController.php | 4 ++-- Controller/BackendController.php | 2 ++ 6 files changed, 28 insertions(+), 9 deletions(-) diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 2f0927f..71845b4 100644 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,6 +23,7 @@ return [ 'dest' => '\Modules\ContractManagement\Controller\ApiContractTypeController:apiContractTypeCreate', 'verb' => RouteVerb::PUT, 'csrf' => true, + 'active' => true, 'permission' => [ 'module' => Controller::NAME, 'type' => PermissionType::READ, @@ -33,6 +34,7 @@ return [ 'dest' => '\Modules\ContractManagement\Controller\ApiContractTypeController:apiContractTypeUpdate', 'verb' => RouteVerb::SET, 'csrf' => true, + 'active' => true, 'permission' => [ 'module' => Controller::NAME, 'type' => PermissionType::READ, @@ -46,6 +48,7 @@ return [ 'dest' => '\Modules\ContractManagement\Controller\ApiController:apiContractCreate', 'verb' => RouteVerb::PUT, 'csrf' => true, + 'active' => true, 'permission' => [ 'module' => Controller::NAME, 'type' => PermissionType::READ, @@ -56,6 +59,7 @@ return [ 'dest' => '\Modules\ContractManagement\Controller\ApiController:apiContractUpdate', 'verb' => RouteVerb::SET, 'csrf' => true, + 'active' => true, 'permission' => [ 'module' => Controller::NAME, 'type' => PermissionType::READ, @@ -69,6 +73,7 @@ return [ 'dest' => '\Modules\ContractManagement\Controller\ApiAttributeController:apiContractAttributeCreate', 'verb' => RouteVerb::PUT, 'csrf' => true, + 'active' => true, 'permission' => [ 'module' => Controller::NAME, 'type' => PermissionType::READ, @@ -79,6 +84,7 @@ return [ 'dest' => '\Modules\ContractManagement\Controller\ApiAttributeController:apiContractAttributeUpdate', 'verb' => RouteVerb::SET, 'csrf' => true, + 'active' => true, 'permission' => [ 'module' => Controller::NAME, 'type' => PermissionType::READ, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index fba9c88..b6f1c94 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -22,6 +22,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContractList', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -33,6 +34,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContract', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -44,6 +46,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContractCreate', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, @@ -55,6 +58,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContractTypeList', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -66,6 +70,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContractType', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -77,6 +82,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContractTypeCreate', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, @@ -88,6 +94,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContractManagementAttributeTypeList', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -99,6 +106,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContractManagementAttributeType', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -110,6 +118,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContractManagementAttributeTypeCreate', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, @@ -121,6 +130,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContractManagementAttributeValue', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -132,6 +142,7 @@ return [ [ 'dest' => '\Modules\ContractManagement\Controller\BackendController:viewContractManagementAttributeValueCreate', 'verb' => RouteVerb::GET, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index 61e20df..88ae3de 100644 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -40,7 +40,7 @@ final class ApiAttributeController extends Controller use \Modules\Attribute\Controller\ApiAttributeTraitController; /** - * Api method to create item attribute + * Api method to create Attribute * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Controller/ApiContractTypeController.php b/Controller/ApiContractTypeController.php index 3156302..9715527 100644 --- a/Controller/ApiContractTypeController.php +++ b/Controller/ApiContractTypeController.php @@ -35,7 +35,7 @@ use phpOMS\Message\ResponseAbstract; final class ApiContractTypeController extends Controller { /** - * Api method to create item attribute type + * Api method to create ContractType * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -62,7 +62,7 @@ final class ApiContractTypeController extends Controller } /** - * Method to create item attribute from request. + * Method to create ContractType from request. * * @param RequestAbstract $request Request * @@ -83,7 +83,7 @@ final class ApiContractTypeController extends Controller } /** - * Validate item attribute create request + * Validate ContractType create request * * @param RequestAbstract $request Request * @@ -103,7 +103,7 @@ final class ApiContractTypeController extends Controller } /** - * Api method to create item attribute l11n + * Api method to create ContractType l11n * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -130,7 +130,7 @@ final class ApiContractTypeController extends Controller } /** - * Method to create item attribute l11n from request. + * Method to create ContractType l11n from request. * * @param RequestAbstract $request Request * @@ -149,7 +149,7 @@ final class ApiContractTypeController extends Controller } /** - * Validate item attribute l11n create request + * Validate ContractType l11n create request * * @param RequestAbstract $request Request * diff --git a/Controller/ApiController.php b/Controller/ApiController.php index c19f89f..7310302 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -327,7 +327,7 @@ final class ApiController extends Controller } /** - * Api method to create item files + * Api method to create Note * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -365,7 +365,7 @@ final class ApiController extends Controller } /** - * Validate item note create request + * Validate note create request * * @param RequestAbstract $request Request * diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 08d12d2..54b0dc7 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -161,10 +161,12 @@ final class BackendController extends Controller ->with('attributes/type') ->with('attributes/value') ->with('attributes/type/l11n') + ->with('attributes/value/l11n') ->with('files') ->with('notes') ->where('id', (int) $request->getData('id')) ->where('attributes/type/l11n/language', $response->header->l11n->language) + ->where('attributes/value/l11n/language', [$response->header->l11n->language, null]) ->sort('files/id', OrderType::DESC) ->execute();