From 8541947caf6e7318682e9d13d59c88d553540325 Mon Sep 17 00:00:00 2001 From: "choi.jh" Date: Tue, 9 Sep 2025 15:19:14 +0900 Subject: [PATCH] dbmsv2 init...1 --- app/Helpers/CommonHelper.php | 16 ++++++++-------- app/Helpers/Customer/ServiceHelper.php | 3 +++ app/Views/admin/index.php | 2 +- app/Views/admin/popup/index.php | 2 +- app/Views/admin/server/index.php | 2 +- app/Views/admin/service/index.php | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index f8e9200..ede7d75 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -207,7 +207,7 @@ class CommonHelper $extra .= sprintf(" %s=\"%s\"", $extra_tag, htmlspecialchars($extra_value, ENT_QUOTES, 'UTF-8')); } // $formOptions는 필터 옵션 배열로, key는 필터 엔티티의 PK, value는 필터 엔티티 객체 - $html = sprintf("", $field, $extra); $html .= $this->form_dropdown_common_process($field, $value, $viewDatas, $extras, $attributes); $html .= ''; return $html; @@ -253,11 +253,11 @@ class CommonHelper { switch ($field) { case 'email': - $form = form_input($field, $value ?? "", ['id' => $field, "placeholder" => "예)test@example.com", ...$extras]); + $form = form_input($field, $value ?? "", ["placeholder" => "예)test@example.com", ...$extras]); break; case 'mobile': case 'phone': - $form = form_input($field, $value ?? "", ['id' => $field, "placeholder" => "예)010-0010-0010", ...$extras]); + $form = form_input($field, $value ?? "", ["placeholder" => "예)010-0010-0010", ...$extras]); break; case 'role': if (!is_array($viewDatas['control']['field_optons'][$field])) { @@ -270,12 +270,12 @@ class CommonHelper if ($key !== '') { // 빈값은 제외 $values = is_array($value) ? $value : explode(DEFAULTS["DELIMITER_ROLE"], $value); //form_check에는 "class" => "form-control" 쓰면 않되거나 form-check를 써야함 - $forms[] = form_checkbox("{$field}[]", $key, in_array($key, $values), ['id' => $field, ...$extras]) . $filterEntity->getTitle(); + $forms[] = form_checkbox("{$field}[]", $key, in_array($key, $values), $extras) . $filterEntity->getTitle(); } } $form = implode(" ", $forms); } else { - $form = $this->form_dropdown_common($field, $value, $viewDatas, ['id' => $field, ...$extras]); + $form = $this->form_dropdown_common($field, $value, $viewDatas, $extras); } break; case 'issue_at': @@ -292,7 +292,7 @@ class CommonHelper case 'content': case 'history': $extras['class'] = array_key_exists('class', $extras) ? $extras['class'] . ' tinymce' : 'tinymce'; - $form = form_textarea($field, $value ?? "", ['id' => $field, ...$extras]); + $form = form_textarea($field, $value ?? "", $extras); break; case 'user_uid': case 'old_clientinfo_uid': @@ -307,7 +307,7 @@ class CommonHelper if (in_array($field, $viewDatas['control']['actionFilters'])) { $form = $this->form_dropdown_common($field, $value, $viewDatas, $extras); } else { - $form = form_input($field, $value ?? "", ['id' => $field, ...$extras]); + $form = form_input($field, $value ?? "", $extras); } break; } @@ -377,7 +377,7 @@ class CommonHelper case 'serviceinfo_uid': case 'serverinfo_uid': $extras['class'] = array_key_exists('class', $extras) ? $extras['class'] . ' select-field' : 'select-field'; - $attributes = []; + $attributes = ['disabled' => null]; $filter = $this->form_dropdown_common($field, $value, $viewDatas, $extras, $attributes); break; default: diff --git a/app/Helpers/Customer/ServiceHelper.php b/app/Helpers/Customer/ServiceHelper.php index 0af8d55..7c4405f 100644 --- a/app/Helpers/Customer/ServiceHelper.php +++ b/app/Helpers/Customer/ServiceHelper.php @@ -36,6 +36,9 @@ class ServiceHelper extends CustomerHelper public function getFieldView(string $field, mixed $value, array $viewDatas, array $extras = []): string|null { switch ($field) { + case 'serverinfo_uid': + $value = $viewDatas['entity']->getServerEntity()->getCustomTitle(); + break; case 'billing_at': if (array_key_exists('unPaids', $viewDatas)) { if (array_key_exists($viewDatas['entity']->getPK(), $viewDatas['unPaids'])) { diff --git a/app/Views/admin/index.php b/app/Views/admin/index.php index df4a1b1..0edc1ef 100644 --- a/app/Views/admin/index.php +++ b/app/Views/admin/index.php @@ -22,7 +22,7 @@ include("templates/{$viewDatas['layout']}/index_content_top"); ?> diff --git a/app/Views/admin/popup/index.php b/app/Views/admin/popup/index.php index e3834ae..cb8748e 100644 --- a/app/Views/admin/popup/index.php +++ b/app/Views/admin/popup/index.php @@ -11,7 +11,7 @@ diff --git a/app/Views/admin/server/index.php b/app/Views/admin/server/index.php index 7c6cd18..03490e7 100644 --- a/app/Views/admin/server/index.php +++ b/app/Views/admin/server/index.php @@ -22,7 +22,7 @@ include("templates/{$viewDatas['layout']}/index_content_top"); ?> diff --git a/app/Views/admin/service/index.php b/app/Views/admin/service/index.php index c10531d..b87edc7 100644 --- a/app/Views/admin/service/index.php +++ b/app/Views/admin/service/index.php @@ -22,7 +22,7 @@ include("templates/{$viewDatas['layout']}/index_content_top"); ?>