From ad66cfcb8ba105068d60b2fd633744830ee0b1fb Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 13:44:52 +0530 Subject: [PATCH 1/4] fix: trigger after_load and after_save explicitly --- frappe/public/js/frappe/web_form/web_form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index 62a339f650..caec796f6d 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -29,7 +29,7 @@ export default class WebForm extends frappe.ui.FieldGroup { // webform client script frappe.init_client_script && frappe.init_client_script(); - frappe.web_form.events.trigger('after_load'); + this.after_load && this.after_load(); } on(fieldname, handler) { @@ -134,7 +134,7 @@ export default class WebForm extends frappe.ui.FieldGroup { if (!response.exc) { // Success this.handle_success(response.message); - frappe.web_form.events.trigger('after_save'); + this.after_save && this.after_save(); } }, always: function() { From 14d02cbbfb7f849c94de07f9c4238a86d7e26e19 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 13:55:47 +0530 Subject: [PATCH 2/4] fix: explicit check of return value of validate --- frappe/public/js/frappe/web_form/web_form.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index caec796f6d..13bba7064c 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -102,7 +102,9 @@ export default class WebForm extends frappe.ui.FieldGroup { } save() { - this.validate && this.validate(); + if (this.validate && !this.validate()) { + frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation")) + } // validation hack: get_values will check for missing data let doc_values = super.get_values(this.allow_incomplete); From 80346e1bd6de3be4d028745ce6e4266a02a0807f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 14:00:04 +0530 Subject: [PATCH 3/4] fix: title --- frappe/public/js/frappe/web_form/web_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index 13bba7064c..b2059d0c38 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -103,7 +103,7 @@ export default class WebForm extends frappe.ui.FieldGroup { save() { if (this.validate && !this.validate()) { - frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation")) + frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation Error")) } // validation hack: get_values will check for missing data From 2190b44a6f46e028cee8773afcc23eca9f4f9ccf Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 28 Apr 2020 19:06:58 +0530 Subject: [PATCH 4/4] fix (style): added semi-colon --- frappe/public/js/frappe/web_form/web_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index b2059d0c38..81b219aece 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -103,7 +103,7 @@ export default class WebForm extends frappe.ui.FieldGroup { save() { if (this.validate && !this.validate()) { - frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation Error")) + frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation Error")); } // validation hack: get_values will check for missing data