Skip to content
Snippets Groups Projects
Commit 9338d6ec authored by Prasad's avatar Prasad
Browse files

Sms notifier tag load action

parents a44601d8 7f8c784c
No related branches found
No related tags found
No related merge requests found
......@@ -608,12 +608,12 @@ class Vtiger_Util_Helper {
//Request will be having in terms of AM and PM but the database will be having in 24 hr format so converting
//Database format
if($fieldInfo->getFieldDataType() == "time") {
if($fieldInfo && $fieldInfo->getFieldDataType() == "time") {
$fieldValue = Vtiger_Time_UIType::getTimeValueWithSeconds($fieldValue);
}
$specialDateTimeConditions = Vtiger_Functions::getSpecialDateTimeCondtions();
if($fieldName == 'date_start' || $fieldName == 'due_date' || $fieldInfo->getFieldDataType() == "datetime" && !in_array($operator, $specialDateTimeConditions) ) {
if($fieldName == 'date_start' || $fieldName == 'due_date' || ($fieldInfo && $fieldInfo->getFieldDataType() == "datetime") && !in_array($operator, $specialDateTimeConditions) ) {
$dateValues = explode(',', $fieldValue);
//Indicate whether it is fist date in the between condition
$isFirstDate = true;
......@@ -633,7 +633,10 @@ class Vtiger_Util_Helper {
$fieldValue = implode(',',$dateValues);
}
$advFilterFieldInfoFormat['columnname'] = $fieldInfo->getCustomViewColumnName();
if ($fieldInfo) {
$columnName = $fieldInfo->getCustomViewColumnName();
}
$advFilterFieldInfoFormat['columnname'] = $columnName;
$advFilterFieldInfoFormat['comparator'] = $operator;
$advFilterFieldInfoFormat['value'] = $fieldValue;
$advFilterFieldInfoFormat['column_condition'] = $groupConditionGlue;
......
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