From 24fb691dd59491571fb5c711ecafea20de7edab0 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Sun, 22 Mar 2020 10:42:00 +0530
Subject: [PATCH] Fixes #1181 Standard EmailTemplates with moduleName,
Migration deleting email records from vtiger_Activity table
---
modules/Migration/schema/660_to_700.php | 7 +++----
modules/Migration/schema/720_to_721.php | 10 ++++++++++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/modules/Migration/schema/660_to_700.php b/modules/Migration/schema/660_to_700.php
index aa55fd77d..bbe645d9c 100644
--- a/modules/Migration/schema/660_to_700.php
+++ b/modules/Migration/schema/660_to_700.php
@@ -432,8 +432,6 @@ if(defined('VTIGER_UPGRADE')) {
if (!in_array('module', $columns)) {
$db->pquery('ALTER TABLE vtiger_emailtemplates ADD COLUMN module VARCHAR(100)', array());
}
- $db->pquery('UPDATE vtiger_emailtemplates SET module=? WHERE templatename IN (?,?,?) AND module IS NULL', array('Events', 'ToDo Reminder', 'Activity Reminder', 'Invite Users'));
- $db->pquery('UPDATE vtiger_emailtemplates SET module=? WHERE module IS NULL', array('Contacts'));
$moduleName = 'Calendar';
$reminderTemplateResult = $db->pquery('SELECT 1 FROM vtiger_emailtemplates WHERE subject=? AND systemtemplate=?', array('Reminder', '1'));
@@ -2215,10 +2213,11 @@ if(defined('VTIGER_UPGRADE')) {
}
}
}
+ $deleteQueryParams = array($moduleName);
if($baseTableName == 'vtiger_activity'){
- array_push($moduleName, "Emails");
+ array_push($deleteQueryParams, "Emails");
}
- $db->pquery("DELETE FROM $baseTableName WHERE $baseTableIndex NOT IN (SELECT crmid FROM vtiger_crmentity WHERE setype in ". generateQuestionMarks($moduleName).")", array($moduleName));
+ $db->pquery("DELETE FROM $baseTableName WHERE $baseTableIndex NOT IN (SELECT crmid FROM vtiger_crmentity WHERE setype in (". generateQuestionMarks($deleteQueryParams)."))", $deleteQueryParams);
}
}
diff --git a/modules/Migration/schema/720_to_721.php b/modules/Migration/schema/720_to_721.php
index 16d263c53..94d12a36f 100644
--- a/modules/Migration/schema/720_to_721.php
+++ b/modules/Migration/schema/720_to_721.php
@@ -82,4 +82,14 @@ if (defined('VTIGER_UPGRADE')) {
//#1248 => updated vtiger_systems.server_password to TEXT
$db->pquery('ALTER TABLE vtiger_systems MODIFY server_password text', array());
+
+ $defaultEventTemplates = array('ToDo Reminder', 'Activity Reminder', 'Invite Users');
+ $updateEventParams = array('Events', 'ToDo Reminder', 'Activity Reminder', 'Invite Users');
+ $db->pquery('UPDATE vtiger_emailtemplates SET module=? WHERE templatename IN ('. generateQuestionMarks($defaultEventTemplates).')', $updateEventParams);
+
+ $defaultContactTemplates = array('Support end notification before a month', 'Support end notification before a week', 'Send Portal login details to customer', 'Thanks Note', 'Customer Login Details', 'Target Crossed!', 'Follow Up', 'Address Change', 'Accept Order', 'Goods received acknowledgement', 'Acceptance Proposal', 'Pending Invoices', 'Announcement for Release');
+ $updateContactParams = array('Contacts','Support end notification before a month', 'Support end notification before a week', 'Send Portal login details to customer', 'Thanks Note', 'Customer Login Details', 'Target Crossed!', 'Follow Up', 'Address Change', 'Accept Order', 'Goods received acknowledgement', 'Acceptance Proposal', 'Pending Invoices', 'Announcement for Release');
+ $db->pquery('UPDATE vtiger_emailtemplates SET module=? WHERE templatename IN ('. generateQuestionMarks($defaultContactTemplates).')', $updateContactParams);
+
+ echo 'Email templates default moduleName updated';
}
\ No newline at end of file
--
GitLab