Skip to content

Commit

Permalink
fix: misc onboarding fixes (#21078) (#21085)
Browse files Browse the repository at this point in the history
* fix: show fields without label too

* fix: make form tour step editable

* fix: hide duplicate save buttons


(cherry picked from commit 1193138)

Co-authored-by: Ankush Menat <ankush@frappe.io>
  • Loading branch information
mergify[bot] and ankush committed May 23, 2023
1 parent c48d636 commit 7a754b7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion frappe/desk/doctype/form_tour_step/form_tour_step.json
Expand Up @@ -2,6 +2,7 @@
"actions": [],
"creation": "2021-05-21 23:05:45.342114",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"is_table_field",
Expand Down Expand Up @@ -115,7 +116,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2022-01-27 15:18:36.481801",
"modified": "2023-05-23 13:09:15.923043",
"modified_by": "Administrator",
"module": "Desk",
"name": "Form Tour Step",
Expand Down
3 changes: 2 additions & 1 deletion frappe/public/js/frappe/form/form.js
Expand Up @@ -1991,7 +1991,8 @@ frappe.ui.form.Form = class FrappeForm {
return new Promise((resolve) => {
frappe.model.with_doctype(reference_doctype, () => {
frappe.get_meta(reference_doctype).fields.map((df) => {
filter_function(df) && options.push({ label: df.label, value: df.fieldname });
filter_function(df) &&
options.push({ label: df.label || df.fieldname, value: df.fieldname });
});
options &&
this.set_df_property(
Expand Down
4 changes: 2 additions & 2 deletions frappe/public/js/frappe/form/form_tour.js
Expand Up @@ -261,10 +261,10 @@ frappe.ui.form.FormTour = class FormTour {
allowClose: false,
overlayClickNext: false,
popover: {
title: __("Save"),
title: __("Save the document."),
description: "",
position: "left",
doneBtnText: __("Save"),
showButtons: false,
},
onNext: () => {
this.frm.save();
Expand Down

0 comments on commit 7a754b7

Please sign in to comment.