From 82c0e0199c7f29556818ad3d007c357e0b853622 Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Fri, 27 Sep 2019 16:17:27 +0530
Subject: [PATCH] Fixes:#1120::Uma::Multipicklist rename and remove of picklist
value
---
modules/Settings/Picklist/models/Module.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/Settings/Picklist/models/Module.php b/modules/Settings/Picklist/models/Module.php
index 1d008fe17..2a597b084 100644
--- a/modules/Settings/Picklist/models/Module.php
+++ b/modules/Settings/Picklist/models/Module.php
@@ -97,7 +97,7 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
$tableName = $row['tablename'];
$columnName = $row['columnname'];
if($fieldModel && $fieldModel->getFieldDataType() == 'multipicklist') {
- $db->pquery('UPDATE '.$tableName.' SET '.$columnName.' = TRIM(BOTH " |##| " FROM REPLACE(CONCAT(" |##| ",CONCAT('.$columnName.', " |##| ")) , "|##| '.$oldValue.' |##|", "|##| '.$newValue.' |##|"))');
+ $db->pquery('UPDATE '.$tableName.' SET '.$columnName.' = TRIM(BOTH " |##| " FROM REPLACE(CONCAT(" |##| ",CONCAT('.$columnName.', " |##| ")) , "|##| '.$oldValue.' |##|", "|##| '.$newValue.' |##|"))', array());
} else {
$query = 'UPDATE ' . $tableName . ' SET ' . $columnName . '=? WHERE ' . $columnName . '=?';
$db->pquery($query, array($newValue, $oldValue));
@@ -204,7 +204,7 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
if($fieldModel && $fieldModel->getFieldDataType() == 'multipicklist') {
foreach($pickListValues as $key => $multipicklistValue) {
- $db->pquery('UPDATE '.$tableName.' SET '.$columnName.' = TRIM(BOTH " |##| " FROM REPLACE(CONCAT(" |##| ",CONCAT('.$columnName.', " |##| ")) , " |##| '.$multipicklistValue.' |##| ", CASE WHEN INSTR(CONCAT(" |##| " ,CONCAT('.$columnName.', " |##| ")), " |##| '.$replaceValue.' |##| ") > 0 THEN " |##| " ELSE " |##| '.$replaceValue.' |##| " END))');
+ $db->pquery('UPDATE '.$tableName.' SET '.$columnName.' = TRIM(BOTH " |##| " FROM REPLACE(CONCAT(" |##| ",CONCAT('.$columnName.', " |##| ")) , " |##| '.$multipicklistValue.' |##| ", CASE WHEN INSTR(CONCAT(" |##| " ,CONCAT('.$columnName.', " |##| ")), " |##| '.$replaceValue.' |##| ") > 0 THEN " |##| " ELSE " |##| '.$replaceValue.' |##| " END))', array());
}
} else {
$query = 'UPDATE '.$tableName.' SET '.$columnName.'=? WHERE '.$columnName.' IN ('. generateQuestionMarks($pickListValues).')';
--
GitLab