From af2dd2613a8e789fad9c91d9d2dc6703567bf560 Mon Sep 17 00:00:00 2001
From: appu <apparao@vtiger.com>
Date: Fri, 19 Jan 2024 06:30:10 +0530
Subject: [PATCH] #Fixes::$fieldValue =
Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
---
modules/Calendar/actions/Save.php | 1 +
modules/SalesOrder/actions/SaveAjax.php | 5 ++---
modules/Vtiger/actions/Save.php | 1 +
modules/Vtiger/actions/SaveAjax.php | 5 ++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/Calendar/actions/Save.php b/modules/Calendar/actions/Save.php
index 0074aa18d..f6b4cf19f 100644
--- a/modules/Calendar/actions/Save.php
+++ b/modules/Calendar/actions/Save.php
@@ -159,6 +159,7 @@ class Calendar_Save_Action extends Vtiger_Save_Action {
if(!is_array($fieldValue)) {
$fieldValue = trim($fieldValue);
}
+ $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
$recordModel->set($fieldName, $fieldValue);
}
}
diff --git a/modules/SalesOrder/actions/SaveAjax.php b/modules/SalesOrder/actions/SaveAjax.php
index 92d2df700..3a04b4049 100755
--- a/modules/SalesOrder/actions/SaveAjax.php
+++ b/modules/SalesOrder/actions/SaveAjax.php
@@ -66,6 +66,7 @@ class SalesOrder_SaveAjax_Action extends Inventory_SaveAjax_Action {
if (!is_array($fieldValue)) {
$fieldValue = trim($fieldValue);
}
+ $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
$recordModel->set($fieldName, $fieldValue);
}
$recordModel->set($fieldName, $fieldValue);
@@ -84,9 +85,6 @@ class SalesOrder_SaveAjax_Action extends Inventory_SaveAjax_Action {
$fieldValue = $fieldModel->getDefaultFieldValue();
}
$fieldDataType = $fieldModel->getFieldDataType();
- if($fieldValue){
- $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue,$fieldModel);
- }
if ($fieldDataType == 'time' && $fieldValue !== null) {
$fieldValue = Vtiger_Time_UIType::getTimeValueWithSeconds($fieldValue);
}
@@ -94,6 +92,7 @@ class SalesOrder_SaveAjax_Action extends Inventory_SaveAjax_Action {
if (!is_array($fieldValue)) {
$fieldValue = trim($fieldValue);
}
+ $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
$recordModel->set($fieldName, $fieldValue);
}
}
diff --git a/modules/Vtiger/actions/Save.php b/modules/Vtiger/actions/Save.php
index 33a714782..4a9c41dd7 100644
--- a/modules/Vtiger/actions/Save.php
+++ b/modules/Vtiger/actions/Save.php
@@ -170,6 +170,7 @@ class Vtiger_Save_Action extends Vtiger_Action_Controller {
if(!is_array($fieldValue) && $fieldDataType != 'currency') {
$fieldValue = trim($fieldValue);
}
+ $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
$recordModel->set($fieldName, $fieldValue);
}
}
diff --git a/modules/Vtiger/actions/SaveAjax.php b/modules/Vtiger/actions/SaveAjax.php
index e8a8618d8..4ab555f85 100644
--- a/modules/Vtiger/actions/SaveAjax.php
+++ b/modules/Vtiger/actions/SaveAjax.php
@@ -111,6 +111,7 @@ class Vtiger_SaveAjax_Action extends Vtiger_Save_Action {
if (!is_array($fieldValue)) {
$fieldValue = trim($fieldValue);
}
+ $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
$recordModel->set($fieldName, $fieldValue);
}
$recordModel->set($fieldName, $fieldValue);
@@ -132,9 +133,6 @@ class Vtiger_SaveAjax_Action extends Vtiger_Save_Action {
} else {
$fieldValue = $fieldModel->getDefaultFieldValue();
}
- if($fieldValue){
- $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue,$fieldModel);
- }
$fieldDataType = $fieldModel->getFieldDataType();
if ($fieldDataType == 'time' && $fieldValue !== null) {
$fieldValue = Vtiger_Time_UIType::getTimeValueWithSeconds($fieldValue);
@@ -144,6 +142,7 @@ class Vtiger_SaveAjax_Action extends Vtiger_Save_Action {
if (!is_array($fieldValue)) {
$fieldValue = trim($fieldValue);
}
+ $fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue, $fieldModel);
$recordModel->set($fieldName, $fieldValue);
}
}
--
GitLab