diff --git a/frappe/printing/page/print_format_builder/print_format_builder.js b/frappe/printing/page/print_format_builder/print_format_builder.js index 51cac66026..b73ff31d32 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder.js +++ b/frappe/printing/page/print_format_builder/print_format_builder.js @@ -261,7 +261,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { } else if(f.fieldtype==="Column Break") { set_column(); - } else if(!in_list(["Section Break", "Column Break", "Tab Break", "Fold"], f.fieldtype) + } else if (!in_list(["Section Break", "Column Break", "Tab Break", "Fold"], f.fieldtype) && f.label) { if(!column) set_column(); @@ -298,7 +298,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { init_visible_columns(f) { f.visible_columns = [] $.each(frappe.get_meta(f.options).fields, function(i, _f) { - if(!in_list(["Section Break", "Column Break", "Tab Break"], _f.fieldtype) && + if (!in_list(["Section Break", "Column Break", "Tab Break"], _f.fieldtype) && !_f.print_hide && f.label) { // column names set as fieldname|width diff --git a/frappe/public/js/frappe/form/column.js b/frappe/public/js/frappe/form/column.js index 8ceb2d029e..c94b0ad8fa 100644 --- a/frappe/public/js/frappe/form/column.js +++ b/frappe/public/js/frappe/form/column.js @@ -38,4 +38,4 @@ frappe.ui.form.Column = class Column { refresh() { this.section.refresh(); } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 83d38b323b..293963433c 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -469,6 +469,7 @@ frappe.ui.form.Form = class FrappeForm { this.$wrapper.trigger('render_complete'); this.cscript.is_onload && this.set_first_tab_as_active(); + if(!this.hidden) { this.layout.show_empty_form_message(); } diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index b4309107bc..0f81195e07 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -115,7 +115,7 @@ frappe.ui.form.Layout = class Layout { // } if (this.tabbed_layout && this.no_opening_tab()) { - this.make_tab({label: __('Details'), fieldname: 'details'}) + this.make_tab({label: __('Details'), fieldname: 'details'}); } if (this.no_opening_section()) { @@ -400,10 +400,9 @@ frappe.ui.form.Layout = class Layout { setup_events() { this.tabs_list.off('click').on('click', '.nav-link', (e) => { - e.preventDefault() + e.preventDefault(); e.stopImmediatePropagation(); $(e.currentTarget).tab('show'); - // this.$current_tab = $(e.currentTarget); }); } @@ -602,7 +601,7 @@ frappe.ui.form.Layout = class Layout { let doc = this.doc; if (!doc && this.get_values) { - let doc = this.get_values(true); + doc = this.get_values(true); } if (!doc) { @@ -640,4 +639,4 @@ frappe.ui.form.Layout = class Layout { return out; } -} +}; diff --git a/frappe/public/js/frappe/form/section.js b/frappe/public/js/frappe/form/section.js index f84dd6a58b..cbbe5a9d20 100644 --- a/frappe/public/js/frappe/form/section.js +++ b/frappe/public/js/frappe/form/section.js @@ -155,4 +155,4 @@ frappe.ui.form.Section = class Section { this.wrapper.toggleClass("hide-control", false); this.tab && this.tab.toggle(true); } -} \ No newline at end of file +}; diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js index 9fc357e9c4..9cc5b78456 100644 --- a/frappe/public/js/frappe/ui/field_group.js +++ b/frappe/public/js/frappe/ui/field_group.js @@ -121,10 +121,10 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { return f && (f.get_value ? f.get_value() : null); } - set_value(key, val){ + set_value(key, val) { return new Promise(resolve => { var f = this.fields_dict[key]; - if(f) { + if (f) { f.set_value(val).then(() => { f.set_input(val); this.refresh_dependency(); @@ -165,4 +165,4 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { field.df[prop] = value; field.refresh(); } -} +};