Skip to content
Snippets Groups Projects
Commit ded2b128 authored by Alexander Schlemmer's avatar Alexander Schlemmer
Browse files

FIX: added unit for workaround

parent a0c1db9f
Branches
No related tags found
3 merge requests!57RELEASE 0.7.3,!50F merge entities,!45F copy entity
Pipeline #21333 passed
Stage: code_style
Stage: linting
Stage: test
Stage: deploy
This commit is part of merge request !50. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
src/caosdb/apiutils.py
+ 1
− 0
View file @ ded2b128
...@@ -748,6 +748,7 @@ def merge_entities(entity_a: Entity, entity_b: Entity): ...@@ -748,6 +748,7 @@ def merge_entities(entity_a: Entity, entity_b: Entity):
name=entity_b.get_property(key).name, name=entity_b.get_property(key).name,
datatype=entity_b.get_property(key).datatype, datatype=entity_b.get_property(key).datatype,
value=entity_b.get_property(key).value, value=entity_b.get_property(key).value,
unit=entity_b.get_property(key).unit,
importance=entity_b.get_importance(key)) importance=entity_b.get_importance(key))
# entity_a.add_property( # entity_a.add_property(
# entity_b.get_property(key), # entity_b.get_property(key),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment