From 7056a44396bd88c11a30c8b5fc509c11d3d3aec5 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 6 Aug 2024 21:10:51 +0900
Subject: [PATCH] Clean up TagModel::getTagList()

---
 modules/board/board.view.php       |  4 ++--
 modules/tag/queries/getTagList.xml |  3 ++-
 modules/tag/tag.model.php          | 20 ++++++--------------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index c598fb025..25b7d5c02 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -717,14 +717,14 @@ class BoardView extends Board
 		$obj = new stdClass;
 		if (empty($this->include_modules))
 		{
-			$obj->mid = $this->module_info->mid;
+			$obj->module_srl = $this->module_info->module_srl;
 		}
 		else
 		{
 			$obj->module_srl = $this->include_modules;
 		}
 		$obj->list_count = 10000;
-		$output = TagModel::getInstance()->getTagList($obj);
+		$output = TagModel::getTagList($obj);
 
 		// automatically order
 		if(count($output->data))
diff --git a/modules/tag/queries/getTagList.xml b/modules/tag/queries/getTagList.xml
index 22323044c..b5d20d5fa 100644
--- a/modules/tag/queries/getTagList.xml
+++ b/modules/tag/queries/getTagList.xml
@@ -13,7 +13,8 @@
         <condition operation="in" column="T.module_srl" var="module_srl" pipe="and" />
     </conditions>
     <navigation>
-        <index var="count" default="count" order="desc" />
+        <index var="sort_index" default="count" order="order_type" order-default="desc" />
+		<index var="count" order="desc" comment="For backward compatibility only" />
         <list_count var="list_count" default="20" />
     </navigation>
     <groups>
diff --git a/modules/tag/tag.model.php b/modules/tag/tag.model.php
index 8cc4a4ef5..78f24b094 100644
--- a/modules/tag/tag.model.php
+++ b/modules/tag/tag.model.php
@@ -83,28 +83,20 @@ class TagModel extends Tag
 	 * @brief Imported Tag List
 	 * Many of the specified module in order to extract the number of tags
 	 */
-	function getTagList($obj)
+	public static function getTagList($obj)
 	{
-		if($obj->mid)
+		if(!empty($obj->mid))
 		{
-			$oModuleModel = getModel('module');
-			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
+			$obj->module_srl = ModuleModel::getModuleSrlByMid($obj->mid);
 			unset($obj->mid);
 		}
 
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl))
-		{
-			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
-		{
-			$args->module_srl = $obj->module_srl;
-		}
-
+		$args->module_srl = $obj->module_srl;
 		$args->list_count = $obj->list_count ?? null;
-		$args->count = $obj->sort_index ?? null;
+		$args->sort_index = $obj->sort_index ?? null;
+		$args->order_type = $obj->order_type ?? null;
 
 		$output = executeQueryArray('tag.getTagList', $args);
 		if(!$output->toBool()) return $output;