From ba64285c66e12b2837f66d723d5d857a36cc2565 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Tue, 30 Jan 2024 17:07:47 +0530 Subject: [PATCH 1/2] Revert "fix(data_import): respect the value of show_failed_logs checkbox" This reverts commit 34f03a2de24a2e34985a1e2e5599e287081f3cf2. --- frappe/core/doctype/data_import/data_import.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js index 9f0e11a7b7..a93671e3e3 100644 --- a/frappe/core/doctype/data_import/data_import.js +++ b/frappe/core/doctype/data_import/data_import.js @@ -506,13 +506,7 @@ frappe.ui.form.on("Data Import", { }, show_import_log(frm) { - if (!frm.doc.show_failed_logs) { - frm.toggle_display("import_log_preview", false); - return; - } - frm.toggle_display("import_log_section", false); - frm.toggle_display("import_log_preview", true); if (frm.import_in_progress) { return; From db1e692d4f1ea44aab10a065d7cd31e5256fae6f Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Tue, 30 Jan 2024 17:08:14 +0530 Subject: [PATCH 2/2] chore: reword checkbox Signed-off-by: Akhil Narang --- frappe/core/doctype/data_import/data_import.json | 4 ++-- frappe/core/doctype/data_import/data_import.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/data_import/data_import.json b/frappe/core/doctype/data_import/data_import.json index 97716219a2..02d65c8004 100644 --- a/frappe/core/doctype/data_import/data_import.json +++ b/frappe/core/doctype/data_import/data_import.json @@ -139,7 +139,7 @@ "default": "0", "fieldname": "show_failed_logs", "fieldtype": "Check", - "label": "Show Failed Logs" + "label": "Show Only Failed Logs" }, { "depends_on": "eval:!doc.__islocal && !doc.import_file", @@ -171,7 +171,7 @@ ], "hide_toolbar": 1, "links": [], - "modified": "2023-12-15 12:45:49.452834", + "modified": "2024-01-30 17:08:05.566686", "modified_by": "Administrator", "module": "Core", "name": "Data Import", diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py index ac28f9091f..c674122f30 100644 --- a/frappe/core/doctype/data_import/data_import.py +++ b/frappe/core/doctype/data_import/data_import.py @@ -38,7 +38,6 @@ class DataImport(Document): submit_after_import: DF.Check template_options: DF.Code | None template_warnings: DF.Code | None - # end: auto-generated types def validate(self):