From 2f2ddd22fcf8c6bad6a9105805d0c995661234ce Mon Sep 17 00:00:00 2001 From: Uma <uma.s@vtiger.com> Date: Tue, 31 Mar 2020 20:23:07 +0530 Subject: [PATCH] Fixes #167 Record deletion clean ModComments --- .../RecycleBin/modules/RecycleBin/models/Module.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/Module.php b/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/Module.php index e24f40407..d9dfed4d5 100644 --- a/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/Module.php +++ b/pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/Module.php @@ -149,6 +149,9 @@ class RecycleBin_Module_Model extends Vtiger_Module_Model { $query = 'DELETE FROM vtiger_relatedlists_rb WHERE entityid in('.generateQuestionMarks($recordIds).')'; $db->pquery($query, array($recordIds)); + + // Delete related mod comments + $this->deleteRelatedComments($recordIds); // TODO - Remove records from module tables and other related stores. $query = 'DELETE FROM vtiger_modtracker_basic WHERE crmid in(' . generateQuestionMarks($recordIds) . ')'; @@ -244,4 +247,13 @@ class RecycleBin_Module_Model extends Vtiger_Module_Model { public function isQuickSearchEnabled() { return true; } + + public function deleteRelatedComments($recordIds) { + $db = PearDatabase::getInstance(); + $query = 'DELETE vtiger_crmentity.* FROM vtiger_crmentity ' + . 'INNER JOIN vtiger_modcomments ON vtiger_modcomments.modcommentsid = vtiger_crmentity.crmid ' + . 'WHERE vtiger_modcomments.related_to in(' . generateQuestionMarks($recordIds) . ')'; + + $db->pquery($query, array($recordIds)); + } } -- GitLab