Skip to content
Snippets Groups Projects
Commit 3bf0fa61 authored by Prasad's avatar Prasad
Browse files

Merge branch 'fix_issue_1777' into 'master'

fixes issue #1777

Closes #1777

See merge request vtiger/vtigercrm!898
parents bb03eb5e 720a2c1c
No related branches found
No related tags found
1 merge request!898fixes issue #1777
...@@ -73,9 +73,8 @@ class VTCreateEntityTask extends VTTask { ...@@ -73,9 +73,8 @@ class VTCreateEntityTask extends VTTask {
if ($fieldValueType == 'fieldname') { if ($fieldValueType == 'fieldname') {
$field = $fieldValue; $field = $fieldValue;
$module = $referenceModule; $module = $referenceModule;
if ($referenceModule == $entityType) {
$fieldValue = $newEntity->column_fields[$fieldValue]; if (php7_count($matches) > 0) {
} else if (php7_count($matches) > 0) {
$referenceField = $matches[1]; $referenceField = $matches[1];
$referencedModule = $matches[2]; $referencedModule = $matches[2];
$referencedFieldName = $matches[3]; $referencedFieldName = $matches[3];
...@@ -90,7 +89,7 @@ class VTCreateEntityTask extends VTTask { ...@@ -90,7 +89,7 @@ class VTCreateEntityTask extends VTTask {
$referenceFieldFocus = $this->getReferenceFieldFocus($referencedModule, $referenceField, $referenceRecordId); $referenceFieldFocus = $this->getReferenceFieldFocus($referencedModule, $referenceField, $referenceRecordId);
$fieldValue = $referenceFieldFocus->column_fields[$referencedFieldName]; $fieldValue = $referenceFieldFocus->column_fields[$referencedFieldName];
} else { } else {
$fieldValue = decode_html($focus->column_fields[$fieldValue]); $fieldValue = decode_html($focus->column_fields[$field]);
} }
$moduleModel = Vtiger_Module_Model::getInstance($module); $moduleModel = Vtiger_Module_Model::getInstance($module);
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment