summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ishtar_common/views.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index cd22d62eb..9936e91e0 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -2152,7 +2152,7 @@ def import_get_status(request, current_right=None):
"progress_percent": item.progress_percent,
})
can_edit_all, can_delete_all, can_edit_own, can_delete_own = models.Import.get_permissions_for_actions(
- request.user
+ request.user, request.session
)
can_edit, can_delete = get_permissions_for_actions(
request.user, item, {}, can_edit_all, can_delete_all, can_edit_own, can_delete_own
@@ -2279,8 +2279,11 @@ class ImportCSVView(ImportPermissionMixin, IshtarMixin, LoginRequiredMixin, Temp
import_item=self.import_item).values_list("pk", "ignored")
data["has_line_errors"] = has_line_errors
data["content"] = []
+ delimiter = ","
+ if self.kwargs["target"] == "source":
+ delimiter = self.import_item.csv_sep
with open(self.csv_file.path, "r", encoding=encoding) as f:
- reader = csv.reader(f)
+ reader = csv.reader(f, delimiter=delimiter)
for idx, line in enumerate(reader):
if not idx:
data["header"] = line