Merge remote-tracking branch 'origin/workflow_relatedmodules'

tsolucio · Jan 30, 2018 · 8f508f1 · 8f508f1
2 parents 1e859d1 + 4f00076
commit 8f508f1
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/modules/com_vtiger_workflow/tasks/VTUpdateFieldsTask.inc b/modules/com_vtiger_workflow/tasks/VTUpdateFieldsTask.inc
@@ -55,8 +55,8 @@ class VTUpdateFieldsTask extends VTTask {
 			if (is_null($current_user)) {
 				$current_user = $hold_user;  // make sure current_user is defined
 			}
-						$relmodule=array();
-
+			$relmodule=array();
+			$handlerMetarel[]=array();
 			foreach ($fieldValueMapping as $fieldInfo) {
 				$fieldName = $fieldInfo['fieldname'];
 				$fieldType = '';
@@ -80,16 +80,17 @@ class VTUpdateFieldsTask extends VTTask {
 						$focusrel["$fieldmodule"]->id = $relId;
 						$focusrel["$fieldmodule"]->mode = 'edit';
 						$focusrel["$fieldmodule"]->retrieve_entity_info($relId, $fieldmodule);
+						$focusrel["$fieldmodule"]->clearSingletonSaveFields();
 					}
 					if (count($relmodule)>3 && $isqueue==false) {
 						$delay = strtotime(" +5 minutes");
 						$taskQueue->queueTask($this->id, $entityId, $delay);
 						return;
 					}
 						 $moduleHandlerrel = vtws_getModuleHandlerFromName($fieldmodule, $current_user);
-						 $handlerMetarel = $moduleHandlerrel->getMeta();
-						 $moduleFieldsrel = $handlerMetarel->getModuleFields();
-						 $fieldValue=$util->fieldvaluebytype($moduleFieldsrel, $fieldValueType, $fieldValue, $fldrelname, $focus, $entity, $handlerMetarel);
+						 $handlerMetarel["$fieldmodule"] = $moduleHandlerrel->getMeta();
+						 $moduleFieldsrel = $handlerMetarel["$fieldmodule"]->getModuleFields();
+						 $fieldValue=$util->fieldvaluebytype($moduleFieldsrel, $fieldValueType, $fieldValue, $fldrelname, $focus, $entity, $handlerMetarel["$fieldmodule"]);
 				} else {
 					$fieldValue=$util->fieldvaluebytype($moduleFields, $fieldValueType, $fieldValue, $fieldName, $focus, $entity, $handlerMeta);
 				}
@@ -108,6 +109,7 @@ class VTUpdateFieldsTask extends VTTask {
 			$focus->saveentity($moduleName);
 			if (count($relmodule)>0 && $relId!='' && $relId!=0) {
 				foreach ($relmodule as $mod) {
+					$focusrel["$mod"]->column_fields = DataTransform::sanitizeRetrieveEntityInfo($focusrel["$mod"]->column_fields, $handlerMetarel["$mod"]);
 					$focusrel["$mod"]->saveentity($mod);
 				}
 			}