From 954ca6175a765ba5d5dbef6224f0fcb1ab99e823 Mon Sep 17 00:00:00 2001 From: vishal Date: Mon, 16 Dec 2019 11:49:29 +0530 Subject: [PATCH 1/4] clear attachment on image remove attach file --- frappe/public/js/frappe/form/controls/attach.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/attach.js b/frappe/public/js/frappe/form/controls/attach.js index 15cbd3b043..cb435c64bd 100644 --- a/frappe/public/js/frappe/form/controls/attach.js +++ b/frappe/public/js/frappe/form/controls/attach.js @@ -32,7 +32,7 @@ frappe.ui.form.ControlAttach = frappe.ui.form.ControlData.extend({ if(this.frm) { me.parse_validate_and_set_in_model(null); me.refresh(); - me.frm.attachments.remove_attachment_by_filename(me.value, function() { + me.frm.attachments.remove_attachment_by_filename(me.value || me.frm.doc[me.frm.meta.image_field], function() { me.parse_validate_and_set_in_model(null); me.refresh(); me.frm.doc.docstatus == 1 ? me.frm.save('Update') : me.frm.save(); From a25a0b46e67b1792cb2fb740f7287cc2f888ac8c Mon Sep 17 00:00:00 2001 From: vishal Date: Wed, 18 Dec 2019 11:11:07 +0530 Subject: [PATCH 2/4] fix: Remove Attachment on remove --- frappe/public/js/frappe/form/controls/attach.js | 2 +- frappe/public/js/frappe/form/sidebar/user_image.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/attach.js b/frappe/public/js/frappe/form/controls/attach.js index cb435c64bd..15cbd3b043 100644 --- a/frappe/public/js/frappe/form/controls/attach.js +++ b/frappe/public/js/frappe/form/controls/attach.js @@ -32,7 +32,7 @@ frappe.ui.form.ControlAttach = frappe.ui.form.ControlData.extend({ if(this.frm) { me.parse_validate_and_set_in_model(null); me.refresh(); - me.frm.attachments.remove_attachment_by_filename(me.value || me.frm.doc[me.frm.meta.image_field], function() { + me.frm.attachments.remove_attachment_by_filename(me.value, function() { me.parse_validate_and_set_in_model(null); me.refresh(); me.frm.doc.docstatus == 1 ? me.frm.save('Update') : me.frm.save(); diff --git a/frappe/public/js/frappe/form/sidebar/user_image.js b/frappe/public/js/frappe/form/sidebar/user_image.js index 6c8099db89..056e5f9427 100644 --- a/frappe/public/js/frappe/form/sidebar/user_image.js +++ b/frappe/public/js/frappe/form/sidebar/user_image.js @@ -88,7 +88,9 @@ frappe.ui.form.setup_user_image_event = function(frm) { } field.$input.trigger('click'); } else { - field.set_value('').then(() => frm.save()); + frm.attachments.remove_attachment_by_filename(frm.doc[frm.meta.image_field] , function() { + field.set_value('').then(() => frm.save()); + }); } }); } \ No newline at end of file From b302437d5c2a902d6f3b8b7405b21f7477c35fa4 Mon Sep 17 00:00:00 2001 From: vishal Date: Wed, 18 Dec 2019 11:18:39 +0530 Subject: [PATCH 3/4] fix: minor changes --- frappe/public/js/frappe/form/sidebar/user_image.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/form/sidebar/user_image.js b/frappe/public/js/frappe/form/sidebar/user_image.js index 056e5f9427..9fe6a4017a 100644 --- a/frappe/public/js/frappe/form/sidebar/user_image.js +++ b/frappe/public/js/frappe/form/sidebar/user_image.js @@ -88,6 +88,7 @@ frappe.ui.form.setup_user_image_event = function(frm) { } field.$input.trigger('click'); } else { + /// on remove event for a sidebar image wrapper remove attach file. frm.attachments.remove_attachment_by_filename(frm.doc[frm.meta.image_field] , function() { field.set_value('').then(() => frm.save()); }); From 918cd70161f20ca631ce020400338d10983352a7 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 18 Dec 2019 11:40:06 +0530 Subject: [PATCH 4/4] style: fix Codacy issue There should be no space before ','. (comma-spacing) --- frappe/public/js/frappe/form/sidebar/user_image.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/user_image.js b/frappe/public/js/frappe/form/sidebar/user_image.js index 9fe6a4017a..cd0993207b 100644 --- a/frappe/public/js/frappe/form/sidebar/user_image.js +++ b/frappe/public/js/frappe/form/sidebar/user_image.js @@ -89,9 +89,9 @@ frappe.ui.form.setup_user_image_event = function(frm) { field.$input.trigger('click'); } else { /// on remove event for a sidebar image wrapper remove attach file. - frm.attachments.remove_attachment_by_filename(frm.doc[frm.meta.image_field] , function() { + frm.attachments.remove_attachment_by_filename(frm.doc[frm.meta.image_field], function() { field.set_value('').then(() => frm.save()); }); } }); -} \ No newline at end of file +}