Skip to content
Snippets Groups Projects
Commit 3997bcf9 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

wip

parent bd17a251
No related branches found
No related tags found
2 merge requests!159Release 0.16.o,!157compare entities and parent/property lists
Pipeline #57268 passed with warnings
......@@ -550,8 +550,7 @@ def merge_entities(entity_a: Entity,
for attribute in ("datatype", "unit", "value"):
if (attribute in diff_r2["properties"][key] and
diff_r2["properties"][key][attribute] is not None):
if (attribute not in diff_r1["properties"][key] or
diff_r1["properties"][key][attribute] is None):
if (diff_r1["properties"][key][attribute] is None):
setattr(entity_a.get_property(key), attribute,
diff_r2["properties"][key][attribute])
elif force:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment