fix(BusinessMap) use Module selected in record to evaluate condition …

…expression if no module is given as parameter
tsolucio · Dec 14, 2021 · b3bab1e · b3bab1e
1 parent 010ac41
commit b3bab1e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/modules/cbMap/processmap/ConditionExpression.php b/modules/cbMap/processmap/ConditionExpression.php
@@ -82,7 +82,12 @@ public function processMap($arguments) {
 				$entity->setData(array_merge($entity->data, $arguments[0]));
 			}
 		} else {
-			$inModule = empty($arguments[0]['module']) ? vtlib_purify($_REQUEST['module']) : $arguments[0]['module'];
+			if (empty($arguments[0]['module']) && empty($_REQUEST['module'])) {
+				$mapFields = $this->getMap();
+				$inModule = $mapFields->column_fields['targetname'];
+			} else {
+				$inModule = empty($arguments[0]['module']) ? vtlib_purify($_REQUEST['module']) : $arguments[0]['module'];
+			}
 			$entity = new cbexpsql_environmentstub($inModule, 0);
 			$entity->setData($arguments[0]);
 		}