Skip to content
Snippets Groups Projects

Fixes:#1173 ::Uma:: Multi picklist Validation and save for editable picklist values is supported

Merged Fixes:#1173 ::Uma:: Multi picklist Validation and save for editable picklist values is supported
Merged Uma requested to merge uma.s/vtigercrm:multi_picklist_Validation_and_Save into master
+ 39
37
Compare changes
  • Side-by-side
  • Inline
Files
@@ -144,16 +144,12 @@ class Calendar_Save_Action extends Vtiger_Save_Action {
$fieldValue = $request->get($fieldName, null);
// For custom time fields in Calendar, it was not converting to db insert format(sending as 10:00 AM/PM)
$fieldDataType = $fieldModel->getFieldDataType();
if($fieldValue){
$fieldValue = Vtiger_Util_Helper::validateFieldValue($fieldValue,$fieldModel);
}
if($fieldDataType == 'time' && $fieldValue !== null){
$fieldValue = Vtiger_Time_UIType::getTimeValueWithSeconds($fieldValue);
}
if(($fieldDataType == 'picklist' || $fieldDataType == 'multipicklist' || $fieldDataType == 'multiowner') && $fieldValue !== null){
$fieldInfo = $fieldModel->getFieldInfo();
$editablePicklistValues = $fieldInfo['editablepicklistvalues'];
if(!empty($editablePicklistValues) && !in_array($fieldValue, $editablePicklistValues)){
$fieldValue = null;
}
}
// End
if ($fieldName === $request->get('field')) {
$fieldValue = $request->get('value');
Loading