From b46cec751821e91b22cfd5dbba78c0a02207a7a0 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Wed, 22 Apr 2020 11:59:33 +0530
Subject: [PATCH] Fixes #1238 Comment enabled related ids to be fetched based
on uitype comparison
---
modules/Vtiger/models/Record.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/Vtiger/models/Record.php b/modules/Vtiger/models/Record.php
index f67c7b1b1..99dd3d430 100644
--- a/modules/Vtiger/models/Record.php
+++ b/modules/Vtiger/models/Record.php
@@ -687,7 +687,8 @@ class Vtiger_Record_Model extends Vtiger_Base_Model {
function getCommentEnabledRelatedEntityIds($modulename, $recordId) {
$user = Users_Record_Model::getCurrentUserModel();
$relatedModuleRecordIds = array();
- $restrictedFieldnames = array('modifiedby', 'created_user_id', 'assigned_user_id');
+ //User fields are restricted types
+ $restrictedFieldUITypes = array(52, 53);
$recordModel = Vtiger_Record_Model::getInstanceById($recordId, $modulename);
$moduleInstance = Vtiger_Module_Model::getInstance($modulename);
$referenceFieldsModels = $moduleInstance->getFieldsByType('reference');
@@ -695,10 +696,11 @@ class Vtiger_Record_Model extends Vtiger_Base_Model {
$directrelatedModuleRecordIds = array();
foreach ($referenceFieldsModels as $referenceFieldsModel) {
+ $relmoduleFieldUIType = $referenceFieldsModel->get('uitype');
$relmoduleFieldname = $referenceFieldsModel->get('name');
$relModuleFieldValue = $recordModel->get($relmoduleFieldname);
-
- if (!empty($relModuleFieldValue) && !in_array($relmoduleFieldname, $restrictedFieldnames) && isRecordExists($relModuleFieldValue)) {
+
+ if (!empty($relModuleFieldValue) && !in_array($relmoduleFieldUIType, $restrictedFieldUITypes) && isRecordExists($relModuleFieldValue)) {
$relModuleRecordModel = Vtiger_Record_Model::getInstanceById($relModuleFieldValue);
$relmodule = $relModuleRecordModel->getModuleName();
@@ -715,7 +717,7 @@ class Vtiger_Record_Model extends Vtiger_Base_Model {
}
}
}
-
+
$moduleModel = Vtiger_Module_Model::getInstance($modulename);
$relatedModuleModels = Vtiger_Relation_Model::getAllRelations($moduleModel, false);
$commentEnabledModules = array();
--
GitLab