From e318f06a0ec49128b920296763a7d2259d0f89da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Thu, 17 Oct 2024 10:08:30 +0900
Subject: [PATCH] cfmgrv4 init...3

---
 app/Controllers/Admin/Cloudflare/RecordController.php | 4 ++--
 app/Helpers/Cloudflare/RecordHelper.php               | 5 ++++-
 app/Helpers/CommonHelper.php                          | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Controllers/Admin/Cloudflare/RecordController.php b/app/Controllers/Admin/Cloudflare/RecordController.php
index c75f680..2166427 100644
--- a/app/Controllers/Admin/Cloudflare/RecordController.php
+++ b/app/Controllers/Admin/Cloudflare/RecordController.php
@@ -167,7 +167,7 @@ class RecordController extends CloudflareController
         $this->action = __FUNCTION__;
         //데이터가 있는경우 Field만 처리하기위해
         $fields = [];
-        foreach (['content', 'proxied'] as $field) {
+        foreach (['type', 'content', 'proxied'] as $field) {
             if ($this->request->getVar($field)) {
                 $fields[$field] = $field;
             }
@@ -252,7 +252,7 @@ class RecordController extends CloudflareController
         $this->field_rules = $this->getModel()->getFieldRules($this->action, $this->fields);
         $this->filter_fields = [$this->getModel()::PARENT, 'type', 'proxied', 'fixed'];
         $this->field_options = $this->getFormFieldOptions($this->filter_fields);
-        $this->batchjob_fields = ['content', 'proxied'];
+        $this->batchjob_fields = ['type', 'content', 'proxied'];
         return $this->list_procedure();
     }
     // Download
diff --git a/app/Helpers/Cloudflare/RecordHelper.php b/app/Helpers/Cloudflare/RecordHelper.php
index 815cf5b..412e8e2 100644
--- a/app/Helpers/Cloudflare/RecordHelper.php
+++ b/app/Helpers/Cloudflare/RecordHelper.php
@@ -98,6 +98,9 @@ class RecordHelper extends CommonHelper
                     $value .= '<script>var tooltipTriggerList = [].slice.call(document.querySelectorAll(\'[data-bs-toggle="tooltip"]\'));var tooltipList = tooltipTriggerList.map(function(tooltipTriggerEl) {return new bootstrap.Tooltip(tooltipTriggerEl);});</script>';
                 }
                 break;
+            case 'type':
+                $value = $value === 'A' ? parent::getFieldView($field, $viewDatas, $extras) : $viewDatas['field_options'][$field][$value];
+                break;
             default:
                 $value = parent::getFieldView($field, $viewDatas, $extras);
                 break;
@@ -127,7 +130,7 @@ class RecordHelper extends CommonHelper
         switch ($action) {
             case 'modify':
                 $checkbox = "";
-                if ($viewDatas['entity']->type == 'A' && $viewDatas['entity']->fixed != 'on') {
+                if ($viewDatas['entity']->fixed != 'on') {
                     $pk = $viewDatas['entity']->getPK();
                     $oldBatchJobUids = old("batchjob_uids") ?? [];
                     $oldBatchJobUids = is_array($oldBatchJobUids) ? $oldBatchJobUids : [$oldBatchJobUids];
diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php
index f0ac864..6454964 100644
--- a/app/Helpers/CommonHelper.php
+++ b/app/Helpers/CommonHelper.php
@@ -207,10 +207,10 @@ class CommonHelper
           $label .= $viewDatas['order_value'] == 'ASC' ? ICONS["UP"] : ICONS["DOWN"];
         }
         $query = $viewDatas['uri']->getQuery(['except' => ['order_field', 'order_value']]);
-        $query .= empty($query) ? "?" : "&";
+        $query .= empty($query) ? "" : "&";
         $query .= "order_field={$field}&order_value=";
         $query .= isset($viewDatas['order_value']) && $viewDatas['order_value'] == 'DESC' ? "ASC" : "DESC";
-        $label = anchor(current_url() . $query, $label);
+        $label = anchor(current_url() . "?" . $query, $label);
         break;
     }
     return $label;