Merge branch '0.8-dev' into add_update

spine-tools · Nov 24, 2023 · efb8808 · efb8808
2 parents 83f94e3 + 04c38da
commit efb8808
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/spinedb_api/export_functions.py b/spinedb_api/export_functions.py
@@ -135,8 +135,8 @@ def export_superclass_subclasses(db_map, ids=Asterisk):
 
 def export_entities(db_map, ids=Asterisk):
     return sorted(
-        ((x.class_name, x.name, x.element_name_list, x.description) for x in _get_items(db_map, "entity", ids)),
-        key=lambda x: (len(x[2]), x[0], x[2], x[1]),
+        ((x.class_name, x.element_name_list or x.name, x.description) for x in _get_items(db_map, "entity", ids)),
+        key=lambda x: (0 if isinstance(x[1], str) else len(x[1]), x[0], (x[1],) if isinstance(x[1], str) else x[1]),
     )