diff --git a/modules/Settings/LayoutEditor/actions/Field.php b/modules/Settings/LayoutEditor/actions/Field.php index 020ffda236580dbdf4c23c19f0651ed7e8be96ae..d3d85189626718f2a4bd07907b6e33a132dbb3cf 100644 --- a/modules/Settings/LayoutEditor/actions/Field.php +++ b/modules/Settings/LayoutEditor/actions/Field.php @@ -37,7 +37,7 @@ class Settings_LayoutEditor_Field_Action extends Settings_Vtiger_Index_Action { if (isset($defaultValue)) { if ($defaultValue && $fieldInfo['type'] == 'date') { $defaultValue = DateTimeField::convertToUserFormat($defaultValue); - } else if (!$defaultValue) { + } else if ($defaultValue) { $defaultValue = $fieldModel->getDisplayValue($defaultValue); } else if (is_array($defaultValue)) { foreach ($defaultValue as $key => $value) { @@ -105,6 +105,10 @@ class Settings_LayoutEditor_Field_Action extends Settings_Vtiger_Index_Action { } else { $defaultValue = decode_html($request->get('fieldDefaultValue')); } + if(preg_match('/AM|PM/',$defaultValue) && ($fieldInstance->get('uitype') =='14')) + { + $defaultValue=Vtiger_Time_UIType::getTimeValueWithSeconds($defaultValue); + } $fieldInstance->set('defaultvalue', $defaultValue); }