[property] Include Parent Properties in Leaf Export

Author: fschrader1992

odml/property.py

@@ -668,14 +668,21 @@ def export_leaf(self):
         """
         Export leaf, start at property.
         """
-        orig = self.parent
-        child = self.clone(keep_id=True)
-        par = child
-
-        while orig is not None:
-            par = orig.clone(children=False, keep_id=True)
-            par.append(child)
+        curr = self.parent
+        par = self.parent
+        child = self.parent
+
+        while curr is not None:
+            par = curr.clone(children=False, keep_id=True)
+            if curr != self.parent:
+                par.append(child)
+            if hasattr(curr, 'properties'):
+                if curr == self.parent:
+                    par.append(self.clone(keep_id=True))
+                else:
+                    for prop in curr.properties:
+                        par.append(prop.clone(keep_id=True))
             child = par
-            orig = orig.parent
+            curr = curr.parent
 
-        return par
+        return par