From 05fbb43c3b70cd7f2dec8a376eab718b211ff3ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0git=20config=20git=20config=20-?= =?UTF-8?q?-helpgit=20config=20--global=20user=2Ename=20=EC=B5=9C=EC=A4=80?= =?UTF-8?q?=ED=9D=A0?= Date: Wed, 21 Jun 2023 02:59:22 +0900 Subject: [PATCH] cfmgrv3 init...3 --- app/Controllers/Admin/Cloudflare/API/FirewallController.php | 4 ++-- app/Controllers/Admin/Cloudflare/API/RecordController.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Controllers/Admin/Cloudflare/API/FirewallController.php b/app/Controllers/Admin/Cloudflare/API/FirewallController.php index a7eca8a..1698806 100644 --- a/app/Controllers/Admin/Cloudflare/API/FirewallController.php +++ b/app/Controllers/Admin/Cloudflare/API/FirewallController.php @@ -92,9 +92,9 @@ class FirewallController extends APIController $builder->select("cloudflarefirewall.*"); $builder->join("cloudflarezone", "cloudflarezone.uid = cloudflarefirewall.zone_uid"); //OrderBy - $order_field = $this->request->getVar('order_field') ? $this->request->getVar('order_field') : 'cloudflarefirewall.uid'; + $order_field = $this->request->getVar('order_field') ? $this->request->getVar('order_field') : 'uid'; $order_value = $this->request->getVar('order_value') ? $this->request->getVar('order_value') : 'DESC'; - $builder->orderBy("cloudflarezone.domain ASC, cloudflarefirewall.description ASC, {$order_field} {$order_value}"); + $builder->orderBy("cloudflarezone.domain ASC, cloudflarefirewall.description ASC, cloudflarefirewall.{$order_field} {$order_value}"); //Limit $builder->limit($per_page, $page * $per_page - $per_page); // log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false)); diff --git a/app/Controllers/Admin/Cloudflare/API/RecordController.php b/app/Controllers/Admin/Cloudflare/API/RecordController.php index fcecf30..191d658 100644 --- a/app/Controllers/Admin/Cloudflare/API/RecordController.php +++ b/app/Controllers/Admin/Cloudflare/API/RecordController.php @@ -147,9 +147,9 @@ class RecordController extends APIController $builder->select("cloudflarerecord.*"); $builder->join("cloudflarezone", "cloudflarezone.uid = cloudflarerecord.zone_uid"); //OrderBy - $order_field = $this->request->getVar('order_field') ? $this->request->getVar('order_field') : 'cloudflarerecord.uid'; + $order_field = $this->request->getVar('order_field') ? $this->request->getVar('order_field') : 'uid'; $order_value = $this->request->getVar('order_value') ? $this->request->getVar('order_value') : 'DESC'; - $builder->orderBy("cloudflarezone.domain ASC, cloudflarerecord.host ASC, {$order_field} {$order_value}"); + $builder->orderBy("cloudflarezone.domain ASC, cloudflarerecord.host ASC, cloudflarerecord.{$order_field} {$order_value}"); //Limit $builder->limit($per_page, $page * $per_page - $per_page); // log_message("debug", __METHOD__ . "에서 호출\n" . $builder->getCompiledSelect(false));