diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py index 4b4e8181adfc023a349161e16bb2bc68638c8dd0..42861bf1e45b31f597c49ff1649d91f595475e08 100644 --- a/src/caosdb/common/models.py +++ b/src/caosdb/common/models.py @@ -298,9 +298,9 @@ class Entity(object): return self._wrapped_entity.path - @link_target.setter - def link_target(self, new_link_target): - self.__link_target = new_link_target + @path.setter + def path(self, new_path): + self.__path = new_path @property def link_target(self): @@ -309,9 +309,9 @@ class Entity(object): return self._wrapped_entity.link_target - @path.setter - def path(self, new_path): - self.__path = new_path + @link_target.setter + def link_target(self, new_link_target): + self.__link_target = new_link_target @property def thumbnail(self): @@ -1076,7 +1076,7 @@ class Entity(object): xml.set("file", self.file) if self.link_target is not None: - xml.set("linktarget", self.link_target) + xml.set("linktarget", str(self.link_target)) if self.checksum is not None: xml.set("checksum", self.checksum) @@ -1132,6 +1132,7 @@ class Entity(object): entity.description = elem.get("description") entity.path = elem.get("path") entity._checksum = elem.get("checksum") + entity.link_target = elem.get("linktarget") entity._size = elem.get("size") entity.datatype = elem.get("datatype") # @ReservedAssignment entity.unit = elem.get("unit") @@ -1835,7 +1836,8 @@ class Record(Entity): class Link(Entity): """This class represents CaosDB's link entities.""" - def __init__(self, name=None, id=None, description=None, path=None, target=None) + def __init__(self, name=None, id=None, description=None, path=None, + target=None): Record.__init__(self, id=id, name=name, description=description) self.role = "Link" self.datatype = None @@ -1923,6 +1925,7 @@ class File(Record): thumbnail : str Deprecated. """ + def __init__(self, name=None, id=None, description=None, path=None, file=None, pickup=None, thumbnail=None):