From f62fece95ef376de07c7f3d495349de96eff9ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= Date: Thu, 8 May 2025 19:04:51 +0900 Subject: [PATCH] dbms_init...1 --- app/Config/Constants.php | 1 - app/Controllers/CommonController.php | 14 +++++--------- app/Helpers/AuthHelper.php | 1 - app/Helpers/CommonHelper.php | 4 ++-- app/Helpers/Customer/ClientHelper.php | 2 +- app/Helpers/Device/DeviceHelper.php | 1 - app/Helpers/MyLogHelper.php | 2 +- app/Helpers/UserHelper.php | 1 - .../templates/admin/index_content_batchjob.php | 2 +- 9 files changed, 10 insertions(+), 18 deletions(-) diff --git a/app/Config/Constants.php b/app/Config/Constants.php index 7498a57..15b2988 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -95,7 +95,6 @@ define('EVENT_PRIORITY_HIGH', 10); //Default값 정의 define('DEFAULTS', [ - 'EMPTY' => "", 'DELIMITER_FILE' => "||", 'DELIMITER_ROLE' => ",", ]); diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php index 439ec22..6820a7f 100644 --- a/app/Controllers/CommonController.php +++ b/app/Controllers/CommonController.php @@ -429,11 +429,7 @@ abstract class CommonController extends BaseController //조건절 처리 foreach ($filter_fields as $field) { $this->$field = $this->request->getVar($field); - echo "
"; - echo "1{$field}:{$this->$field}"; - echo "
"; if (!is_null($this->$field)) { - echo "2{$field}:{$this->$field}"; $this->getService()->getModel()->where($this->getService()->getModel()->getTable() . '.' . $field, $this->$field); } } @@ -488,12 +484,12 @@ abstract class CommonController extends BaseController //Pagination 처리 $this->pagination = $this->getPaginationForList(); //OrderBy 처리 - $this->order_field = $this->request->getVar('order_field') ?? DEFAULTS['EMPTY']; - $this->order_value = $this->request->getVar('order_value') ?? DEFAULTS['EMPTY']; - if ($this->order_field !== DEFAULTS['EMPTY'] && $this->order_value !== DEFAULTS['EMPTY']) { - $this->getService()->getModel()->orderBy(sprintf("%s.%s %s", $this->getService()->getModel()::TABLE, $this->order_field, $this->order_value)); + $this->order_field = $this->request->getVar('order_field'); + $this->order_value = $this->request->getVar('order_value'); + if ($this->order_field && $this->order_value) { + $this->getService()->getModel()->orderBy(sprintf("%s.%s %s", $this->getService()->getModel()->getTable(), $this->order_field, $this->order_value)); } else { - $this->getService()->getModel()->orderBy(sprintf("%s.%s %s", $this->getService()->getModel()::TABLE, $this->getService()->getModel()::PK, "DESC")); + $this->getService()->getModel()->orderBy(sprintf("%s.%s %s", $this->getService()->getModel()->getTable(), $this->getService()->getModel()->getPKField(), "DESC")); } $this->getService()->getModel()->limit($this->per_page); $this->getService()->getModel()->offset(($this->page - 1) * $this->per_page); diff --git a/app/Helpers/AuthHelper.php b/app/Helpers/AuthHelper.php index 846ff27..01071a6 100644 --- a/app/Helpers/AuthHelper.php +++ b/app/Helpers/AuthHelper.php @@ -18,7 +18,6 @@ class AuthHelper extends CommonHelper if (in_array($viewDatas['action'], ['create', 'modify'])) { $extras = (strpos($viewDatas['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; } - $value = $value ?? DEFAULTS['EMPTY']; switch ($field) { case 'id': case 'passwd': diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 9a2df28..6009640 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -184,7 +184,6 @@ class CommonHelper if (in_array($viewDatas['action'], ['create', 'modify'])) { $extras = (strpos($viewDatas['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; } - $value = $value ?? DEFAULTS['EMPTY']; switch ($field) { case 'email': $form = form_input($field, $value, ["placeholder" => "예)test@example.com", ...$extras]); @@ -239,7 +238,7 @@ class CommonHelper public function getFieldView(string $field, array $viewDatas, array $extras = []): string { - $value = $viewDatas['entity']->$field ?? DEFAULTS['EMPTY']; + $value = $viewDatas['entity']->$field; switch ($field) { case $this->getTitleField(): $value = form_label( @@ -300,6 +299,7 @@ class CommonHelper { return $entity->isMatched($field, $value) ? "" : 'class="table-danger"'; } + public function getListLabel(string $field, array $viewDatas, array $extras = []): string { switch ($field) { diff --git a/app/Helpers/Customer/ClientHelper.php b/app/Helpers/Customer/ClientHelper.php index bb9cff9..91a38cd 100644 --- a/app/Helpers/Customer/ClientHelper.php +++ b/app/Helpers/Customer/ClientHelper.php @@ -15,7 +15,7 @@ class ClientHelper extends CustomerHelper } public function getFieldView(string $field, array $viewDatas, array $extras = []): string { - $value = $viewDatas['entity']->$field ?? DEFAULTS['EMPTY']; + $value = $viewDatas['entity']->$field; switch ($field) { case 'account_balance': case 'coupon_balance': diff --git a/app/Helpers/Device/DeviceHelper.php b/app/Helpers/Device/DeviceHelper.php index 06f200e..a2fd23d 100644 --- a/app/Helpers/Device/DeviceHelper.php +++ b/app/Helpers/Device/DeviceHelper.php @@ -16,7 +16,6 @@ class DeviceHelper extends CommonHelper if (in_array($viewDatas['action'], ['create', 'modify'])) { $extras = (strpos($viewDatas['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; } - $value = $value ?? DEFAULTS['EMPTY']; switch ($field) { case "serverinfo_uid": if (!is_array($viewDatas['field_options'][$field])) { diff --git a/app/Helpers/MyLogHelper.php b/app/Helpers/MyLogHelper.php index 9763be3..ac7a042 100644 --- a/app/Helpers/MyLogHelper.php +++ b/app/Helpers/MyLogHelper.php @@ -16,7 +16,7 @@ class MyLogHelper extends CommonHelper public function getFieldView(string $field, array $viewDatas, array $extras = []): string { - $value = $viewDatas['entity']->$field ?? DEFAULTS['EMPTY']; + $value = $viewDatas['entity']->$field; switch ($field) { case 'content': $value = nl2br($value); diff --git a/app/Helpers/UserHelper.php b/app/Helpers/UserHelper.php index dc02803..43a5e42 100644 --- a/app/Helpers/UserHelper.php +++ b/app/Helpers/UserHelper.php @@ -18,7 +18,6 @@ class UserHelper extends CommonHelper if (in_array($viewDatas['action'], ['create', 'modify'])) { $extras = (strpos($viewDatas['field_rules'][$field], 'required') !== false) ? ["class" => "form-control", "required" => "", ...$extras] : ["class" => "form-control", ...$extras]; } - $value = $value ?? DEFAULTS['EMPTY']; switch ($field) { case 'passwd': case 'confirmpassword': diff --git a/app/Views/templates/admin/index_content_batchjob.php b/app/Views/templates/admin/index_content_batchjob.php index 870ddf6..b1b512d 100644 --- a/app/Views/templates/admin/index_content_batchjob.php +++ b/app/Views/templates/admin/index_content_batchjob.php @@ -2,7 +2,7 @@