From 3781cd3d753b551298f73abd25a027380a937a52 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Thu, 2 Jul 2020 16:49:24 +0530
Subject: [PATCH] Fixes saving role2 picklist values
---
modules/Settings/Picklist/models/Module.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/Settings/Picklist/models/Module.php b/modules/Settings/Picklist/models/Module.php
index 4194034cd..8cab658fc 100644
--- a/modules/Settings/Picklist/models/Module.php
+++ b/modules/Settings/Picklist/models/Module.php
@@ -284,13 +284,13 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
$deleteValueList[] = ' ( roleid = "'.$roleId.'" AND '.'picklistvalueid = "'.$pickListValueId.'") ';
}
}
- $query = 'INSERT IGNORE INTO vtiger_role2picklist (roleid,picklistvalueid,picklistid) VALUES '. generateQuestionMarks($insertValueList);
- $result = $db->pquery($query, $insertValueList);
-
- $deleteQuery = 'DELETE FROM vtiger_role2picklist WHERE '.implode(' OR ',$deleteValueList);
-
- $result = $db->pquery($deleteQuery,array());
+ $query = 'INSERT IGNORE INTO vtiger_role2picklist (roleid,picklistvalueid,picklistid) VALUES '. implode(",", $insertValueList);
+ $result = $db->pquery($query, array());
+ if(!empty($deleteValueList)){
+ $deleteQuery = 'DELETE FROM vtiger_role2picklist WHERE '.implode(' OR ',$deleteValueList);
+ $result = $db->pquery($deleteQuery,array());
+ }
//retaining to older value
$db->dieOnError = $dieOnErrorOldValue;
--
GitLab