Skip to content
Snippets Groups Projects
Commit 39298c1e authored by Apparao G's avatar Apparao G
Browse files

#Fixes::157703673::yogeshwar::custom field timezone AM PM displaying twice

parents ffdbf16f a461458e
No related branches found
No related tags found
No related merge requests found
......@@ -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);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment