🐛 fix empty columns in data export

1 files changed, 9 insertions, 2 deletions

diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index e4a9333b4..5e9135c7a 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -3091,10 +3091,17 @@ def get_item(
                         else:
                             lnk = lnk.replace("<lock>", "")
                     res["link"] = lnk
+                delta = 0
                 for idx, value in enumerate(data[1:]):
-                    if not value or idx >= len(table_cols):
+                    if not value:
+                        continue
+                    table_col = None
+                    while not table_col and (idx + delta) < len(table_cols):
+                        table_col = table_cols[idx + delta]
+                        if not table_col:
+                            delta += 1
+                    if (idx + delta) >= len(table_cols):
                         continue
-                    table_col = table_cols[idx]
                     if type(table_col) not in (list, tuple):
                         table_col = [table_col]
                     tab_cols = []