From 2ac747bf7087c5461d9c0c2f9ca903605750c099 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 31 Jan 2021 17:32:36 +0900
Subject: [PATCH] Fix #1592 include extra_sort.value in column list

---
 modules/document/document.model.php                       | 4 ++++
 modules/document/queries/getDocumentListExtraSort.xml     | 1 +
 modules/document/queries/getDocumentListWithExtraVars.xml | 1 +
 3 files changed, 6 insertions(+)

diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index a35446cd8..adddf77e2 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -1440,6 +1440,10 @@ class documentModel extends document
 					$args->sort_index = 'extra_sort.value';
 				}
 				$query_id = 'document.getDocumentListWithExtraVars';
+				if($args->columnList)
+				{
+					$args->columnList[] = 'extra_sort.value';
+				}
 			}
 			else
 			{
diff --git a/modules/document/queries/getDocumentListExtraSort.xml b/modules/document/queries/getDocumentListExtraSort.xml
index 6e22df49a..b04de20ee 100644
--- a/modules/document/queries/getDocumentListExtraSort.xml
+++ b/modules/document/queries/getDocumentListExtraSort.xml
@@ -5,6 +5,7 @@
     </tables>
     <columns distinct="distinct">
         <column name="d.*" />
+        <column name="ev.value" />
     </columns>
     <index_hint name="idx_document_list_order" type="use" />
     <conditions>
diff --git a/modules/document/queries/getDocumentListWithExtraVars.xml b/modules/document/queries/getDocumentListWithExtraVars.xml
index 0257435ef..4d3993952 100644
--- a/modules/document/queries/getDocumentListWithExtraVars.xml
+++ b/modules/document/queries/getDocumentListWithExtraVars.xml
@@ -6,6 +6,7 @@
 	</tables>
 	<columns distinct="distinct">
 		<column name="documents.*" />
+		<column name="extra_sort.value" />
 	</columns>
 	<conditions>
 		<condition operation="like" column="extra_vars.value" var="var_value" />