vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: use doc in webform save (#8353)

Browse source 
* fix: use doc in webform save

* style: better comments

* fix: redirect to successurl fix
This commit is contained in:
Shivam Mishra 2019-09-08 12:29:54 +05:30 • committed by Faris Ansari
parent 355fc4b49e
commit 58b94c561a
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
frappe/public/js/frappe/web_form/web_form.js
View file

@ -97,20 +97,18 @@ export default class WebForm extends frappe.ui.FieldGroup {
);
}
get_values(ignore_errors) {
let values = super.get_values(ignore_errors);
values.doctype = this.doc_type;
values.name = this.doc_name;
values.web_form_name = this.name;
return values;
}
save() {
this.validate && this.validate();
// validation hack: get_values will check for missing data
super.get_values(this.allow_incomplete);
if (window.saving) return;
let for_payment = Boolean(this.accept_payment && !this.doc.paid);
let data = this.get_values(this.allow_incomplete);
if (!data || window.saving) return;
this.doc.doctype = this.doc_type;
this.doc.name = this.doc_name;
this.doc.web_form_name = this.name;
// Save
window.saving = true;
@ -120,7 +118,7 @@ export default class WebForm extends frappe.ui.FieldGroup {
type: "POST",
method: "frappe.website.doctype.web_form.web_form.accept",
args: {
data: data,
data: this.doc,
web_form: this.name,
docname: this.doc.name,
for_payment
@ -170,13 +168,11 @@ export default class WebForm extends frappe.ui.FieldGroup {
const success_dialog = new frappe.ui.Dialog({
title: __("Saved Successfully"),
secondary_action: () => {
if (this.login_required) {
if (this.route_to_success_link) {
window.location.pathname = this.success_url;
} else {
window.location.href =
window.location.pathname + "?name=" + data.name;
}
if (this.success_url) {
window.location.pathname = this.success_url;
} else if(this.login_required) {
window.location.href =
window.location.pathname + "?name=" + data.name;
}
}
});