Skip to content
Snippets Groups Projects

compare entities and parent/property lists

Merged Henrik tom Wörden requested to merge f-review-lists-and-compare into dev
1 unresolved thread
1 file
+ 1
2
Compare changes
  • Side-by-side
  • Inline
+ 1
2
@@ -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:
Loading