From a0021cc5f888589294eebf17294e7dff2a929663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= Date: Tue, 25 Nov 2025 12:31:32 +0900 Subject: [PATCH] dbmsv4 init...1 --- app/Controllers/AbstractCRUDController.php | 2 +- app/Controllers/AbstractWebController.php | 2 +- app/Controllers/Admin/AdminController.php | 6 +++--- app/Controllers/Admin/Home.php | 4 ++-- app/Forms/CommonForm.php | 14 -------------- app/Services/BoardService.php | 5 ++--- app/Services/CommonService.php | 2 +- app/Services/Customer/AccountService.php | 5 ++--- app/Services/Customer/ClientService.php | 5 ++--- app/Services/Customer/CouponService.php | 5 ++--- app/Services/Customer/PointService.php | 5 ++--- app/Services/Customer/ServiceService.php | 5 ++--- app/Services/Equipment/LineService.php | 5 ++--- app/Services/Equipment/ServerPartService.php | 5 ++--- app/Services/Equipment/ServerService.php | 5 ++--- app/Services/MylogService.php | 5 ++--- app/Services/Part/CPUService.php | 5 ++--- app/Services/Part/CSService.php | 5 ++--- app/Services/Part/DISKService.php | 5 ++--- app/Services/Part/IPService.php | 5 ++--- app/Services/Part/RAMService.php | 5 ++--- app/Services/Part/SOFTWAREService.php | 5 ++--- app/Services/Part/SWITCHService.php | 5 ++--- app/Services/PaymentService.php | 5 ++--- app/Services/UserService.php | 5 ++--- 25 files changed, 46 insertions(+), 79 deletions(-) diff --git a/app/Controllers/AbstractCRUDController.php b/app/Controllers/AbstractCRUDController.php index 0110607..9b5062f 100644 --- a/app/Controllers/AbstractCRUDController.php +++ b/app/Controllers/AbstractCRUDController.php @@ -104,7 +104,7 @@ abstract class AbstractCRUDController extends AbstractWebController } $this->addViewDatas('entity', $entity); $action = __FUNCTION__; - $this->action_init_process($action, [], $entity); + $this->action_init_process($action); return $this->modify_form_result_process($action); } catch (\Exception $e) { return $this->action_redirect_process('error', "{$this->getTitle()}에서 {$uid} 수정폼 오류:" . $e->getMessage()); diff --git a/app/Controllers/AbstractWebController.php b/app/Controllers/AbstractWebController.php index 984362f..52cef09 100644 --- a/app/Controllers/AbstractWebController.php +++ b/app/Controllers/AbstractWebController.php @@ -76,7 +76,7 @@ abstract class AbstractWebController extends Controller /** * 모든 액션 실행 전 공통 초기화 작업 */ - protected function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + protected function action_init_process(string $action, array $formDatas = []): void { $this->addViewDatas('action', $action); $this->addViewDatas('authContext', $this->getAuthContext()); diff --git a/app/Controllers/Admin/AdminController.php b/app/Controllers/Admin/AdminController.php index 0660b3f..26c31c9 100644 --- a/app/Controllers/Admin/AdminController.php +++ b/app/Controllers/Admin/AdminController.php @@ -17,10 +17,10 @@ abstract class AdminController extends CommonController $this->addActionPaths($this->_layout); $this->layouts = LAYOUTS[$this->_layout]; } - protected function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + protected function action_init_process(string $action, array $formDatas = []): void { - $this->service->action_init_process($action, $formDatas, $entity); - parent::action_init_process($action, $formDatas, $entity); + $this->service->action_init_process($action, $formDatas); + parent::action_init_process($action, $formDatas); $this->addViewDatas('layout', $this->layouts); $this->addViewDatas('title', $this->getTitle()); $this->addViewDatas('helper', $this->service->getHelper()); diff --git a/app/Controllers/Admin/Home.php b/app/Controllers/Admin/Home.php index 4a61931..a914cf1 100644 --- a/app/Controllers/Admin/Home.php +++ b/app/Controllers/Admin/Home.php @@ -17,10 +17,10 @@ class Home extends AbstractWebController } $this->addActionPaths('home'); } - protected function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + protected function action_init_process(string $action, array $formDatas = []): void { // $this->service->action_init_process($action, $entity); - parent::action_init_process($action, $formDatas, $entity); + parent::action_init_process($action, $formDatas); $this->addViewDatas('layout', LAYOUTS['admin']); } //Index,FieldForm관련 diff --git a/app/Forms/CommonForm.php b/app/Forms/CommonForm.php index 6a9767e..e1134bc 100644 --- a/app/Forms/CommonForm.php +++ b/app/Forms/CommonForm.php @@ -8,7 +8,6 @@ use RuntimeException; abstract class CommonForm { private array $_attributes = []; - private array $_formDatas = []; private array $_formFields = []; private array $_formRules = []; private array $_formFilters = []; @@ -29,19 +28,6 @@ abstract class CommonForm } return $this->_attributes[$key]; } - final public function setFormDatas(array $formDatas): void - { - $this->_formDatas = $formDatas; - } - //$fields 매치된것만 반환, []->전체 - final public function getFormDatas(array $fields = []): array - { - if (empty($fields)) { - return $this->_formDatas; - } - // _formDatas 키를 비교하여 교집합을 반환합니다. $fields에 지정된 필드 정의만 추출됩니다. - return array_intersect_key($this->_formDatas, array_flip($fields)); - } final public function setFormFields(array $fields): void { foreach ($fields as $field) { diff --git a/app/Services/BoardService.php b/app/Services/BoardService.php index e554a44..47f40e1 100644 --- a/app/Services/BoardService.php +++ b/app/Services/BoardService.php @@ -53,7 +53,7 @@ class BoardService extends CommonService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ 'category', @@ -108,11 +108,10 @@ class BoardService extends CommonService ]; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/CommonService.php b/app/Services/CommonService.php index 88335de..395f1a1 100644 --- a/app/Services/CommonService.php +++ b/app/Services/CommonService.php @@ -30,7 +30,7 @@ abstract class CommonService { return $isArray ? $this->_classPaths : implode($delimeter, $this->_classPaths); } - abstract public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void; + abstract public function action_init_process(string $action, array $formDatas = []): void; /** * 단일 엔티티를 조회합니다. * @return CommonEntity|null CommonEntity 인스턴스 또는 찾지 못했을 경우 null diff --git a/app/Services/Customer/AccountService.php b/app/Services/Customer/AccountService.php index a6b4913..588d45c 100644 --- a/app/Services/Customer/AccountService.php +++ b/app/Services/Customer/AccountService.php @@ -54,7 +54,7 @@ class AccountService extends CustomerService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "clientinfo_uid", @@ -89,11 +89,10 @@ class AccountService extends CustomerService $fields = [...$fields, 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Customer/ClientService.php b/app/Services/Customer/ClientService.php index 42544b8..97a1413 100644 --- a/app/Services/Customer/ClientService.php +++ b/app/Services/Customer/ClientService.php @@ -54,7 +54,7 @@ class ClientService extends CustomerService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ 'site', @@ -98,11 +98,10 @@ class ClientService extends CustomerService ]; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Customer/CouponService.php b/app/Services/Customer/CouponService.php index f8dc767..b3af376 100644 --- a/app/Services/Customer/CouponService.php +++ b/app/Services/Customer/CouponService.php @@ -54,7 +54,7 @@ class CouponService extends CustomerService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "clientinfo_uid", @@ -83,11 +83,10 @@ class CouponService extends CustomerService $fields = [...$fields, 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Customer/PointService.php b/app/Services/Customer/PointService.php index 96d5c59..f612376 100644 --- a/app/Services/Customer/PointService.php +++ b/app/Services/Customer/PointService.php @@ -54,7 +54,7 @@ class PointService extends CustomerService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "clientinfo_uid", @@ -83,11 +83,10 @@ class PointService extends CustomerService $fields = [...$fields, 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Customer/ServiceService.php b/app/Services/Customer/ServiceService.php index b4886b1..60307eb 100644 --- a/app/Services/Customer/ServiceService.php +++ b/app/Services/Customer/ServiceService.php @@ -56,7 +56,7 @@ class ServiceService extends CustomerService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "site", @@ -115,11 +115,10 @@ class ServiceService extends CustomerService ]; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Equipment/LineService.php b/app/Services/Equipment/LineService.php index ead9f9a..1bc8e6a 100644 --- a/app/Services/Equipment/LineService.php +++ b/app/Services/Equipment/LineService.php @@ -54,7 +54,7 @@ class LineService extends EquipmentService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "type", @@ -84,11 +84,10 @@ class LineService extends EquipmentService $fields = [...$fields, 'status', 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Equipment/ServerPartService.php b/app/Services/Equipment/ServerPartService.php index e30d8bf..26e8a23 100644 --- a/app/Services/Equipment/ServerPartService.php +++ b/app/Services/Equipment/ServerPartService.php @@ -56,7 +56,7 @@ class ServerPartService extends EquipmentService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "serverinfo_uid", @@ -93,11 +93,10 @@ class ServerPartService extends EquipmentService $fields = [...$fields, 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Equipment/ServerService.php b/app/Services/Equipment/ServerService.php index eeeb9ff..897e6d5 100644 --- a/app/Services/Equipment/ServerService.php +++ b/app/Services/Equipment/ServerService.php @@ -54,7 +54,7 @@ class ServerService extends EquipmentService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "code", @@ -106,11 +106,10 @@ class ServerService extends EquipmentService ]; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/MylogService.php b/app/Services/MylogService.php index 62b6698..6e83282 100644 --- a/app/Services/MylogService.php +++ b/app/Services/MylogService.php @@ -42,7 +42,7 @@ class MylogService extends CommonService implements PipelineStepInterface } return $this->_form; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = ['title', 'content']; $filters = []; @@ -62,11 +62,10 @@ class MylogService extends CommonService implements PipelineStepInterface $fields = [...$fields, 'status', 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Part/CPUService.php b/app/Services/Part/CPUService.php index 73f3873..71769ba 100644 --- a/app/Services/Part/CPUService.php +++ b/app/Services/Part/CPUService.php @@ -54,7 +54,7 @@ class CPUService extends PartService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "title", @@ -81,11 +81,10 @@ class CPUService extends PartService $fields = [...$fields, 'status', 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Part/CSService.php b/app/Services/Part/CSService.php index a883298..b905445 100644 --- a/app/Services/Part/CSService.php +++ b/app/Services/Part/CSService.php @@ -54,7 +54,7 @@ class CSService extends PartService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "type", @@ -108,11 +108,10 @@ class CSService extends PartService ]; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Part/DISKService.php b/app/Services/Part/DISKService.php index ed10551..dfb9032 100644 --- a/app/Services/Part/DISKService.php +++ b/app/Services/Part/DISKService.php @@ -54,7 +54,7 @@ class DISKService extends PartService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "title", @@ -82,11 +82,10 @@ class DISKService extends PartService $fields = [...$fields, "format", 'status', 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Part/IPService.php b/app/Services/Part/IPService.php index 9e990a5..5bfc02a 100644 --- a/app/Services/Part/IPService.php +++ b/app/Services/Part/IPService.php @@ -54,7 +54,7 @@ class IPService extends PartService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "lineinfo_uid", @@ -99,11 +99,10 @@ class IPService extends PartService ]; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Part/RAMService.php b/app/Services/Part/RAMService.php index cd22fe8..e5941a7 100644 --- a/app/Services/Part/RAMService.php +++ b/app/Services/Part/RAMService.php @@ -54,7 +54,7 @@ class RAMService extends PartService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "title", @@ -81,11 +81,10 @@ class RAMService extends PartService $fields = [...$fields, 'status', 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Part/SOFTWAREService.php b/app/Services/Part/SOFTWAREService.php index 1fd1ce4..0a34e0e 100644 --- a/app/Services/Part/SOFTWAREService.php +++ b/app/Services/Part/SOFTWAREService.php @@ -40,7 +40,7 @@ class SOFTWAREService extends PartService } return $this->_form; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "title", @@ -67,11 +67,10 @@ class SOFTWAREService extends PartService $fields = [...$fields, 'status', 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/Part/SWITCHService.php b/app/Services/Part/SWITCHService.php index 7031e05..a679606 100644 --- a/app/Services/Part/SWITCHService.php +++ b/app/Services/Part/SWITCHService.php @@ -54,7 +54,7 @@ class SWITCHService extends PartService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "code", @@ -100,11 +100,10 @@ class SWITCHService extends PartService ]; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php index b583a32..f5aecfb 100644 --- a/app/Services/PaymentService.php +++ b/app/Services/PaymentService.php @@ -54,7 +54,7 @@ class PaymentService extends CommonService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ "serviceinfo_uid", @@ -119,11 +119,10 @@ class PaymentService extends CommonService ]; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); } diff --git a/app/Services/UserService.php b/app/Services/UserService.php index fd8572b..81361c2 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -54,7 +54,7 @@ class UserService extends CommonService } return $this->_helper; } - public function action_init_process(string $action, array $formDatas = [], ?object $entity = null): void + public function action_init_process(string $action, array $formDatas = []): void { $fields = [ 'id', @@ -84,11 +84,10 @@ class UserService extends CommonService $fields = ['id', 'name', 'email', 'mobile', 'role', 'status', 'created_at']; break; } - $this->getFormService()->setFormDatas($formDatas); $this->getFormService()->setFormFields($fields); $this->getFormService()->setFormRules($action, $fields); $this->getFormService()->setFormFilters($filters); - $this->getFormService()->setFormOptions($action, $filters, $entity); + $this->getFormService()->setFormOptions($action, $filters, $formDatas); $this->getFormService()->setIndexFilters($indexFilter); $this->getFormService()->setBatchjobFilters($batchjobFilters); }