From 0cf38ff9a8b9efef30a5a96291ff672d41fc80ef Mon Sep 17 00:00:00 2001
From: Prasad <prasad@vtiger.com>
Date: Tue, 14 May 2024 21:04:47 +0530
Subject: [PATCH] Fixes #1879: Reference label column with multiple fields
corrected
---
include/QueryGenerator/QueryGenerator.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/include/QueryGenerator/QueryGenerator.php b/include/QueryGenerator/QueryGenerator.php
index 2e102314d..c26274fd0 100644
--- a/include/QueryGenerator/QueryGenerator.php
+++ b/include/QueryGenerator/QueryGenerator.php
@@ -762,7 +762,13 @@ class QueryGenerator {
$columnList[] = "$referenceTable.$column";
}
if(php7_count($columnList) > 1) {
- $columnSql = getSqlForNameInDisplayFormat(array('first_name'=>$columnList[0],'last_name'=>$columnList[1]),'Users');
+ if ($module == "Users") {
+ // Special case
+ $columnSql = getSqlForNameInDisplayFormat(array('first_name'=>$columnList[0],'last_name'=>$columnList[1]),'Users');
+ } else {
+ // Leads or contacts
+ $columnSql = getSqlForNameInDisplayFormat(array('firstname'=>$columnList[0],'lastname'=>$columnList[1]), $module);
+ }
} else {
$columnSql = implode('', $columnList);
}
--
GitLab