From 7013a36629abf6e964e0a398513e54a21be96108 Mon Sep 17 00:00:00 2001 From: Bavisetti Narayan <72156168+NarayanBavisetti@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:18:59 +0530 Subject: [PATCH] [WEB-2430] fix: issue exports for project (#5579) * fix: issue exports for project * chore: code cleanup --- apiserver/plane/bgtasks/export_task.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/apiserver/plane/bgtasks/export_task.py b/apiserver/plane/bgtasks/export_task.py index 27d6ff476..e671608d9 100644 --- a/apiserver/plane/bgtasks/export_task.py +++ b/apiserver/plane/bgtasks/export_task.py @@ -244,9 +244,13 @@ def update_json_row(rows, row): ) assignee, label = row["Assignee"], row["Labels"] - if assignee is not None and assignee not in existing_assignees: + if assignee is not None and ( + existing_assignees is None or label not in existing_assignees + ): rows[matched_index]["Assignee"] += f", {assignee}" - if label is not None and label not in existing_labels: + if label is not None and ( + existing_labels is None or label not in existing_labels + ): rows[matched_index]["Labels"] += f", {label}" else: rows.append(row) @@ -266,9 +270,13 @@ def update_table_row(rows, row): existing_assignees, existing_labels = rows[matched_index][7:9] assignee, label = row[7:9] - if assignee is not None and assignee not in existing_assignees: - rows[matched_index][7] += f", {assignee}" - if label is not None and label not in existing_labels: + if assignee is not None and ( + existing_assignees is None or label not in existing_assignees + ): + rows[matched_index][8] += f", {assignee}" + if label is not None and ( + existing_labels is None or label not in existing_labels + ): rows[matched_index][8] += f", {label}" else: rows.append(row)