From d006797d0903b10bf8b2894f894eaee088b659a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Wed, 6 Nov 2024 09:20:33 +0100
Subject: [PATCH] Revert "wip"
This reverts commit 3997bcf974b965e29ec7dae80ada67315dddb2c7.
---
src/linkahead/apiutils.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/linkahead/apiutils.py b/src/linkahead/apiutils.py
index 2ad4ef98..d51171c7 100644
--- a/src/linkahead/apiutils.py
+++ b/src/linkahead/apiutils.py
@@ -550,7 +550,8 @@ 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 (diff_r1["properties"][key][attribute] is None):
+ if (attribute not in diff_r1["properties"][key] or
+ diff_r1["properties"][key][attribute] is None):
setattr(entity_a.get_property(key), attribute,
diff_r2["properties"][key][attribute])
elif force:
--
GitLab