1 files changed, 16 insertions, 1 deletions
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index 735ad0b10..201b39a5b 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -1311,11 +1311,26 @@ class ImportGroup(BaseImport):
     def __str__(self):
         return f"{self.name} ({self.importer_type.name})"
 
+    def import_list(self):
+        """
+        Sorted import list by order in the importer group
+        """
+        import_list = []
+        for imp in self.imports.all():
+            igi = ImporterGroupImporter.objects.filter(
+                group=self.importer_type,
+                importer_type=imp.importer_type
+            )
+            if not igi.count():  # inconsistent data
+                continue
+            import_list.append((igi.all()[0].order, imp))
+        return [imp for order, imp in sorted(import_list, key=lambda i: i[0])]
+
     @property
     def status(self):
         if self.state not in IMPORT_GROUP_STATE_DCT:
             return ""
-        return IMPORT_GROUP_STATE_DCT[self.state]
+        return IMPORT_GROUP_STATE_DCT[str(self.state)]
 
     def get_actions(self):
         """