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

Merge pull request #13605 from nextchamp-saqib/form-tour-fixes

Browse source 
fix: multiple form tour issues
This commit is contained in:
mergify[bot] 2021-07-22 04:33:20 +00:00 • committed by GitHub
commit 84b721e2b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/desk/doctype/form_tour/form_tour.js
View file

@ -15,14 +15,14 @@ frappe.ui.form.on('Form Tour', {
frm.add_custom_button(__('Show Tour'), async () => {
const issingle = await check_if_single(frm.doc.reference_doctype);
let route_changed = null;
if (issingle) {
frappe.set_route('Form', frm.doc.reference_doctype);
route_changed = frappe.set_route('Form', frm.doc.reference_doctype);
} else {
const new_name = 'new-' + frappe.scrub(frm.doc.reference_doctype) + '-1';
frappe.set_route('Form', frm.doc.reference_doctype, new_name);
route_changed = frappe.set_route('Form', frm.doc.reference_doctype, 'new');
}
frappe.utils.sleep(500).then(() => {
route_changed.then(() => {
const tour_name = frm.doc.name;
cur_frm.tour
.init({ tour_name })

15
frappe/public/js/frappe/form/form_tour.js
View file

@ -2,8 +2,6 @@ frappe.ui.form.FormTour = class FormTour {
constructor({ frm }) {
this.frm = frm;
this.driver_steps = [];
this.init_driver();
}
init_driver() {
@ -37,11 +35,17 @@ frappe.ui.form.FormTour = class FormTour {
if (tour_name) {
this.tour = await frappe.db.get_doc('Form Tour', tour_name);
} else {
this.tour = { steps: frappe.tour[this.frm.doctype] };
const doctype_tour_exists = await frappe.db.exists('Form Tour', this.frm.doctype);
if (doctype_tour_exists) {
this.tour = await frappe.db.get_doc('Form Tour', this.frm.doctype);
} else {
this.tour = { steps: frappe.tour[this.frm.doctype] };
}
}
if (on_finish) this.on_finish = on_finish;
this.init_driver();
this.build_steps();
this.update_driver_steps();
}
@ -232,7 +236,7 @@ frappe.ui.form.FormTour = class FormTour {
}
add_step_to_save() {
const page_id = `#page-${this.frm.doctype}`;
const page_id = `[id="page-${this.frm.doctype}"]`;
const $save_btn = `${page_id} .standard-actions .primary-action`;
const save_step = {
element: $save_btn,
@ -244,6 +248,9 @@ frappe.ui.form.FormTour = class FormTour {
description: "",
position: "left",
doneBtnText: __("Save")
},
onNext: () => {
this.frm.save();
}
};
this.driver_steps.push(save_step);