From 74e5c61ec4e31822922ad5c7730103c0d372cac2 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 30 Sep 2024 06:52:44 +0200 Subject: [PATCH 1/2] feat: set flag during bulk delete c/o doc on_trash event --- frappe/desk/reportview.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 97df586c05..3b71c0732f 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -541,6 +541,7 @@ def delete_bulk(doctype, items): undeleted_items = [] for i, d in enumerate(items): try: + frappe.flags.in_bulk_delete = True frappe.delete_doc(doctype, d) if len(items) >= 5: frappe.publish_realtime( From 07ed21f363e415e852fbc11bde3c446d54d7025e Mon Sep 17 00:00:00 2001 From: David Date: Mon, 30 Sep 2024 06:53:18 +0200 Subject: [PATCH 2/2] fix: add doctype even without docname to file loader form --- frappe/public/js/frappe/file_uploader/FileUploader.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue index d4fd952c8c..03eddc8a00 100644 --- a/frappe/public/js/frappe/file_uploader/FileUploader.vue +++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue @@ -651,8 +651,11 @@ function upload_file(file, i) { form_data.append("library_file_name", file.library_file_name); } - if (props.doctype && props.docname) { + if (props.doctype) { form_data.append("doctype", props.doctype); + } + + if (props.docname) { form_data.append("docname", props.docname); }