diff --git a/app/Controllers/Admin/BoardController.php b/app/Controllers/Admin/BoardController.php index 1468ee0..f6be0f6 100644 --- a/app/Controllers/Admin/BoardController.php +++ b/app/Controllers/Admin/BoardController.php @@ -33,6 +33,7 @@ class BoardController extends AdminController 'category', 'status', ]; + $indexFilter = $filters; $batchjobFilters = ['user_uid', 'category', 'status']; switch ($action) { case 'create': @@ -79,6 +80,7 @@ class BoardController extends AdminController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Customer/AccountController.php b/app/Controllers/Admin/Customer/AccountController.php index 7fa448f..88b79e5 100644 --- a/app/Controllers/Admin/Customer/AccountController.php +++ b/app/Controllers/Admin/Customer/AccountController.php @@ -34,6 +34,7 @@ class AccountController extends CustomerController "bank", "status", ]; + $indexFilter = $filters; $batchjobFilters = ['status']; parent::action_init_process($action); switch ($action) { @@ -57,6 +58,7 @@ class AccountController extends CustomerController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Customer/ClientController.php b/app/Controllers/Admin/Customer/ClientController.php index 90813a3..3f0dd45 100644 --- a/app/Controllers/Admin/Customer/ClientController.php +++ b/app/Controllers/Admin/Customer/ClientController.php @@ -31,9 +31,8 @@ class ClientController extends CustomerController 'role', 'status', ]; + $indexFilter = $filters; $batchjobFilters = ['status']; - // $actionButtons = ['view' => ICONS['SEARCH']]; - // $batchjobButtons = []; parent::action_init_process($action); switch ($action) { case 'create': @@ -68,6 +67,7 @@ class ClientController extends CustomerController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Customer/CouponController.php b/app/Controllers/Admin/Customer/CouponController.php index cf95281..79866a7 100644 --- a/app/Controllers/Admin/Customer/CouponController.php +++ b/app/Controllers/Admin/Customer/CouponController.php @@ -34,6 +34,7 @@ class CouponController extends CustomerController "clientinfo_uid", "status", ]; + $indexFilter = $filters; $batchjobFilters = ['status']; parent::action_init_process($action); switch ($action) { @@ -57,6 +58,7 @@ class CouponController extends CustomerController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Customer/PointController.php b/app/Controllers/Admin/Customer/PointController.php index a18179a..78db64f 100644 --- a/app/Controllers/Admin/Customer/PointController.php +++ b/app/Controllers/Admin/Customer/PointController.php @@ -30,6 +30,7 @@ class PointController extends CustomerController "clientinfo_uid", "status", ]; + $indexFilter = $filters; $batchjobFilters = ['status']; parent::action_init_process($action); switch ($action) { @@ -53,6 +54,7 @@ class PointController extends CustomerController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Customer/ServiceController.php b/app/Controllers/Admin/Customer/ServiceController.php index 10c7ffc..153e38d 100644 --- a/app/Controllers/Admin/Customer/ServiceController.php +++ b/app/Controllers/Admin/Customer/ServiceController.php @@ -42,6 +42,7 @@ class ServiceController extends CustomerController 'user_uid', 'status', ]; + $indexFilter = $filters; $batchjobFilters = [ 'site', 'location', @@ -70,7 +71,6 @@ class ServiceController extends CustomerController 'billing_at', 'status', 'start_at', - 'updated_at', 'created_at' ]; break; @@ -82,6 +82,7 @@ class ServiceController extends CustomerController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Equipment/LineController.php b/app/Controllers/Admin/Equipment/LineController.php index 790da78..78c6444 100644 --- a/app/Controllers/Admin/Equipment/LineController.php +++ b/app/Controllers/Admin/Equipment/LineController.php @@ -31,6 +31,7 @@ class LineController extends EquipmentController "clientinfo_uid", "status", ]; + $indexFilter = $filters; $batchjobFilters = ['status']; parent::action_init_process($action); switch ($action) { @@ -55,6 +56,7 @@ class LineController extends EquipmentController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Equipment/ServerController.php b/app/Controllers/Admin/Equipment/ServerController.php index 38c3850..cd3a4c6 100644 --- a/app/Controllers/Admin/Equipment/ServerController.php +++ b/app/Controllers/Admin/Equipment/ServerController.php @@ -34,6 +34,7 @@ class ServerController extends EquipmentController "clientinfo_uid", "status", ]; + $indexFilter = $filters; $batchjobFilters = ['status']; parent::action_init_process($action); switch ($action) { @@ -58,6 +59,7 @@ class ServerController extends EquipmentController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Equipment/ServerPartController.php b/app/Controllers/Admin/Equipment/ServerPartController.php index 9bc0dd9..18b7112 100644 --- a/app/Controllers/Admin/Equipment/ServerPartController.php +++ b/app/Controllers/Admin/Equipment/ServerPartController.php @@ -35,6 +35,7 @@ class ServerPartController extends EquipmentController "part_uid", "billing", ]; + $indexFilter = $filters; $batchjobFilters = ['billing', 'type']; parent::action_init_process($action); switch ($action) { @@ -59,6 +60,7 @@ class ServerPartController extends EquipmentController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/MylogController.php b/app/Controllers/Admin/MylogController.php index 8bb0cac..377ebab 100644 --- a/app/Controllers/Admin/MylogController.php +++ b/app/Controllers/Admin/MylogController.php @@ -21,6 +21,7 @@ class MylogController extends AdminController { $fields = ['title', 'content']; $filters = []; + $indexFilter = $filters; $batchjobFilters = $filters; parent::action_init_process($action); switch ($action) { @@ -44,6 +45,7 @@ class MylogController extends AdminController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/CPUController.php b/app/Controllers/Admin/Part/CPUController.php index dd0ef04..3e1c047 100644 --- a/app/Controllers/Admin/Part/CPUController.php +++ b/app/Controllers/Admin/Part/CPUController.php @@ -27,6 +27,7 @@ class CPUController extends PartController $filters = [ "status", ]; + $indexFilter = $filters; $batchjobFilters = ['status']; parent::action_init_process($action); switch ($action) { @@ -51,6 +52,7 @@ class CPUController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/CSController.php b/app/Controllers/Admin/Part/CSController.php index 1d4c4d4..53db67c 100644 --- a/app/Controllers/Admin/Part/CSController.php +++ b/app/Controllers/Admin/Part/CSController.php @@ -32,9 +32,8 @@ class CSController extends PartController 'type', 'status' ]; + $indexFilter = $filters; $batchjobFilters = ['status']; - // $actionButtons = ['view' => ICONS['SEARCH']]; - // $batchjobButtons = []; parent::action_init_process($action); switch ($action) { case 'create': @@ -80,6 +79,7 @@ class CSController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/DISKController.php b/app/Controllers/Admin/Part/DISKController.php index 24fdebc..1fd614a 100644 --- a/app/Controllers/Admin/Part/DISKController.php +++ b/app/Controllers/Admin/Part/DISKController.php @@ -28,6 +28,7 @@ class DISKController extends PartController $filters = [ "status", ]; + $indexFilter = $filters; $batchjobFilters = ['status']; parent::action_init_process($action); switch ($action) { @@ -52,6 +53,7 @@ class DISKController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action);; } diff --git a/app/Controllers/Admin/Part/IPController.php b/app/Controllers/Admin/Part/IPController.php index 4c2caeb..8a9edb5 100644 --- a/app/Controllers/Admin/Part/IPController.php +++ b/app/Controllers/Admin/Part/IPController.php @@ -31,6 +31,7 @@ class IPController extends PartController "lineinfo_uid", 'status' ]; + $indexFilter = $filters; $batchjobFilters = ['status']; parent::action_init_process($action); switch ($action) { @@ -69,6 +70,7 @@ class IPController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/RAMController.php b/app/Controllers/Admin/Part/RAMController.php index c6ce75c..dd694ce 100644 --- a/app/Controllers/Admin/Part/RAMController.php +++ b/app/Controllers/Admin/Part/RAMController.php @@ -27,6 +27,7 @@ class RAMController extends PartController $filters = [ "status", ]; + $indexFilter = $filters; $batchjobFilters = ['status']; parent::action_init_process($action); switch ($action) { @@ -51,6 +52,7 @@ class RAMController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/SOFTWAREController.php b/app/Controllers/Admin/Part/SOFTWAREController.php index 807c96d..c8d50e3 100644 --- a/app/Controllers/Admin/Part/SOFTWAREController.php +++ b/app/Controllers/Admin/Part/SOFTWAREController.php @@ -27,6 +27,7 @@ class SOFTWAREController extends PartController $filters = [ "status", ]; + $indexFilter = $filters; $batchjobFilters = ['status']; parent::action_init_process($action); switch ($action) { @@ -51,6 +52,7 @@ class SOFTWAREController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/Part/SWITCHController.php b/app/Controllers/Admin/Part/SWITCHController.php index cfeecbe..3554022 100644 --- a/app/Controllers/Admin/Part/SWITCHController.php +++ b/app/Controllers/Admin/Part/SWITCHController.php @@ -29,10 +29,8 @@ class SWITCHController extends PartController 'serverinfo_uid', 'status' ]; - $batchjobFilters = [ - 'status', - ]; - + $indexFilter = $filters; + $batchjobFilters = ['status',]; parent::action_init_process($action); switch ($action) { case 'create': @@ -73,6 +71,7 @@ class SWITCHController extends PartController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/PaymentController.php b/app/Controllers/Admin/PaymentController.php index 79e5a08..615d6db 100644 --- a/app/Controllers/Admin/PaymentController.php +++ b/app/Controllers/Admin/PaymentController.php @@ -29,6 +29,7 @@ class PaymentController extends AdminController "content ", ]; $filters = ['user_uid', 'clientinfo_uid', 'serviceinfo_uid', 'status', 'billing', 'pay']; + $indexFilter = $filters; $batchjobFilters = ['status']; switch ($action) { case 'create': @@ -71,7 +72,6 @@ class PaymentController extends AdminController 'user_uid', 'created_at' ]; - $filters = ['user_uid', 'clientinfo_uid', 'serviceinfo_uid', 'status', 'billing']; break; default: throw new \Exception("[{$action}] 지원하지 않는 action입니다."); @@ -81,6 +81,7 @@ class PaymentController extends AdminController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/Admin/UserController.php b/app/Controllers/Admin/UserController.php index d08800c..69071ca 100644 --- a/app/Controllers/Admin/UserController.php +++ b/app/Controllers/Admin/UserController.php @@ -30,6 +30,7 @@ class UserController extends AdminController 'role' ]; $filters = ['role', 'status']; + $indexFilter = $filters; $batchjobFilters = ['status']; switch ($action) { case 'create': @@ -54,6 +55,7 @@ class UserController extends AdminController $this->service->getFormService()->setFormRules($action, $fields); $this->service->getFormService()->setFormFilters($filters); $this->service->getFormService()->setFormOptions($filters); + $this->service->getFormService()->getIndexFilters($indexFilter); $this->service->getFormService()->setBatchjobFilters($batchjobFilters); parent::action_init_process($action); } diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index 9099f6e..02de942 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -147,7 +147,7 @@ abstract class CommonController extends AbstractCRUDController { // Filter조건절 처리 $index_filters = []; - foreach ($this->service->getFormService()->getFormFilters($action) as $field) { + foreach ($this->service->getFormService()->getIndexFilters($action) as $field) { $value = $this->request->getVar($field) ?? null; if ($value) { $this->service->setFilter($field, $value); diff --git a/app/Forms/CommonForm.php b/app/Forms/CommonForm.php index 5181167..94ca74f 100644 --- a/app/Forms/CommonForm.php +++ b/app/Forms/CommonForm.php @@ -11,6 +11,7 @@ abstract class CommonForm private array $_formFields = []; private array $_formRules = []; private array $_formFilters = []; + private array $_indexFilters = []; private array $_batchjobFilters = []; private array $_formOptions = []; private array $_actionButtons = ['view' => ICONS['SEARCH'], 'delete' => ICONS['DELETE']]; @@ -80,6 +81,14 @@ abstract class CommonForm { return $this->_formFilters; } + final public function setIndexFilters(array $fields): void + { + $this->_indexFilters = $fields;; + } + final public function getIndexFilters(): array + { + return $this->_indexFilters; + } final public function setBatchjobFilters(array $fields): void { $this->_batchjobFilters = $fields;; diff --git a/app/Helpers/Customer/ClientHelper.php b/app/Helpers/Customer/ClientHelper.php index a1737e1..5fc85aa 100644 --- a/app/Helpers/Customer/ClientHelper.php +++ b/app/Helpers/Customer/ClientHelper.php @@ -90,15 +90,15 @@ class ClientHelper extends CustomerHelper public function getListButton(string $action, string $label, array $viewDatas, array $extras = []): string { switch ($action) { - case 'modify': - $action = $this->getAuthContext()->isAccessRole([ROLE['USER']['SECURITY']]) ? parent::getListButton($action, $label, $viewDatas, $extras) : $label; - break; case 'create': case 'delete': case 'batchjob': case 'batchjob_delete': $action = $this->getAuthContext()->isAccessRole([ROLE['USER']['SECURITY']]) ? parent::getListButton($action, $label, $viewDatas, $extras) : ""; break; + case 'modify': + $action = $this->getAuthContext()->isAccessRole([ROLE['USER']['SECURITY']]) ? parent::getListButton($action, $label, $viewDatas, $extras) : $label; + break; case 'history': $action = form_label( $label ? $label : ICONS['HISTORY'], diff --git a/app/Helpers/PaymentHelper.php b/app/Helpers/PaymentHelper.php index 50e186d..d7de39d 100644 --- a/app/Helpers/PaymentHelper.php +++ b/app/Helpers/PaymentHelper.php @@ -43,10 +43,7 @@ class PaymentHelper extends CommonHelper } break; case 'delete': - $action = ""; - if ($this->getAuthContext()->isAccessRole([ROLE['USER']['SECURITY']])) { - $action = parent::getListButton($action, $label, $viewDatas, $extras); - } + $action = $this->getAuthContext()->isAccessRole([ROLE['USER']['SECURITY']]) ? parent::getListButton($action, $label, $viewDatas, $extras) : ""; break; case 'paid': $action = form_submit($action . "_submit", $label ? $label : '결제 처리', [