From 774f5cc1c6b4e289b238d2d7dd099a133b6319ea Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:30:24 +0200 Subject: [PATCH] fix(Data Import): don't rely on permission for Data Import Log (#26228) --- frappe/core/doctype/data_import/data_import.js | 10 ++-------- frappe/core/doctype/data_import/data_import.py | 14 ++++++++++++++ .../doctype/data_import_log/data_import_log.json | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js index c27ea9a062..61fd6f538b 100644 --- a/frappe/core/doctype/data_import/data_import.js +++ b/frappe/core/doctype/data_import/data_import.js @@ -404,15 +404,9 @@ frappe.ui.form.on("Data Import", { render_import_log(frm) { frappe.call({ - method: "frappe.client.get_list", + method: "frappe.core.doctype.data_import.data_import.get_import_logs", args: { - doctype: "Data Import Log", - filters: { - data_import: frm.doc.name, - }, - fields: ["success", "docname", "messages", "exception", "row_indexes"], - limit_page_length: 5000, - order_by: "log_index", + data_import: frm.doc.name, }, callback: function (r) { let logs = r.message; diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py index cbecca8dfc..7a0397bba6 100644 --- a/frappe/core/doctype/data_import/data_import.py +++ b/frappe/core/doctype/data_import/data_import.py @@ -218,6 +218,20 @@ def get_import_status(data_import_name): return import_status +@frappe.whitelist() +def get_import_logs(data_import: str): + doc = frappe.get_doc("Data Import", data_import) + doc.check_permission("read") + + return frappe.get_all( + "Data Import Log", + fields=["success", "docname", "messages", "exception", "row_indexes"], + filters={"data_import": data_import}, + limit_page_length=5000, + order_by="log_index", + ) + + def import_file(doctype, file_path, import_type, submit_after_import=False, console=False): """ Import documents in from CSV or XLSX using data import. diff --git a/frappe/core/doctype/data_import_log/data_import_log.json b/frappe/core/doctype/data_import_log/data_import_log.json index e76a1c1169..c184df193d 100644 --- a/frappe/core/doctype/data_import_log/data_import_log.json +++ b/frappe/core/doctype/data_import_log/data_import_log.json @@ -58,9 +58,8 @@ } ], "in_create": 1, - "index_web_pages_for_search": 1, "links": [], - "modified": "2024-03-23 16:02:17.334396", + "modified": "2024-04-29 18:44:17.050909", "modified_by": "Administrator", "module": "Core", "name": "Data Import Log", @@ -79,6 +78,7 @@ "write": 1 } ], + "read_only": 1, "sort_field": "creation", "sort_order": "DESC", "states": []