Merge pull request #38743 from sokumon/toggle-chart
This commit is contained in:
commit
c7bfffd7e0
3 changed files with 7 additions and 1 deletions
|
|
@ -143,6 +143,9 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout {
|
|||
let f = this.fields_dict[key];
|
||||
if (f.get_value) {
|
||||
let v = f.get_value();
|
||||
if (!v && f.df.include_default) {
|
||||
v = f.df.default;
|
||||
}
|
||||
if (f.df.reqd && is_null(typeof v === "string" ? strip_html(v) : v))
|
||||
errors.push(__(f.df.label));
|
||||
|
||||
|
|
|
|||
|
|
@ -431,7 +431,9 @@ frappe.ui.GroupBy = class {
|
|||
this.get_group_by_field_label(),
|
||||
])
|
||||
: __("Add Group");
|
||||
|
||||
if (group_by_applied) {
|
||||
this.group_by_button.find(".button-label").css("gap", "4px");
|
||||
}
|
||||
this.group_by_button
|
||||
.toggleClass("btn-default", !group_by_applied)
|
||||
.toggleClass("btn-primary-light", group_by_applied);
|
||||
|
|
|
|||
|
|
@ -579,6 +579,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
|
|||
options: y_fields,
|
||||
description: __("Showing only Numeric fields from Report"),
|
||||
default: defaults.y_axes ? defaults.y_axes.join(", ") : null,
|
||||
include_default: true,
|
||||
},
|
||||
{
|
||||
label: __("Chart Type"),
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue