Skip to content
Snippets Groups Projects
Commit 964e8b6f authored by Uma's avatar Uma
Browse files

Fixes #1263 Code correction on Merge request

parent 1522b48e
No related branches found
No related tags found
No related merge requests found
......@@ -215,8 +215,22 @@ class WorkFlowScheduler {
if($operation == 'has changed from') continue;
$value = $condition['value'];
$fieldname = $condition['fieldname'];
preg_match('/(\w+) : \((\w+)\) (\w+)/', $condition['fieldname'], $matches);
if (count($matches) != 0) {
list($full, $referenceField, $referenceModule, $fieldname) = $matches;
}
if($referenceField) {
$moduleName = $referenceModule;
} else {
$moduleName = $queryGenerator->getModule();
}
$moduleModel = Vtiger_Module_Model::getInstance($moduleName);
$fieldModel = $moduleModel->getField($fieldname);
if(in_array($operation, $this->_specialDateTimeOperator())) {
$value = $this->_parseValueForDate($condition);
$value = $this->_parseValueForDate($condition, $fieldModel);
}
$columnCondition = $condition['joincondition'];
$groupId = $condition['groupid'];
......@@ -294,7 +308,7 @@ class WorkFlowScheduler {
* @param <Array> $condition
* @return <String>
*/
function _parseValueForDate($condition) {
function _parseValueForDate($condition,$fieldModel = false) {
$value = $condition['value'];
$operation = $condition['operation'];
......@@ -303,6 +317,11 @@ class WorkFlowScheduler {
$admin = Users::getActiveAdminUser();
$adminTimeZone = $admin->time_zone;
@date_default_timezone_set($adminTimeZone);
$fieldType = array();
if($fieldModel){
$dataType = $fieldModel->get('typeofdata');
$fieldType = explode('~',$dataType);
}
switch($operation) {
case 'less than days ago' : //between current date and (currentdate - givenValue)
......
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