Merge pull request #272 from PROCOLLAB-github/hotfix_forbidden_symbols

HOTFIX2 get rid of forbidden symbols
PROCOLLAB-github · Feb 12, 2024 · 2ba2391 · 2ba2391
2 parents 75f6262 + a8ec678
commit 2ba2391
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/partner_programs/admin.py b/partner_programs/admin.py
@@ -1,5 +1,5 @@
 import tablib
-
+import re
 from django.contrib import admin
 from django.http import HttpResponse
 from django.urls import path
@@ -103,12 +103,15 @@ def get_export_file(self, partner_program: PartnerProgram):
                 ]
 
             json_data = profile.partner_program_data
+            ILLEGAL_CHARACTERS_RE = re.compile(r"[\000-\010]|[\013-\014]|[\016-\037]")
+
             for key in json_schema:
-                row.append(
-                    json_data.get(
-                        key, ""
-                    )  # .encode("ascii", errors="ignore").decode(), "")
-                )
+                value = json_data.get(key, "")  # Получаем значение из json_data
+                cleaned_value = ILLEGAL_CHARACTERS_RE.sub(
+                    "", value
+                )  # Удаляем недопустимые символы из значения
+                row.append(cleaned_value)  # Добавляем очищенное значение в row
+
             response_data.append(row)
 
         binary_data = response_data.export("xlsx")