Merge pull request frappe#21537 from vorasmit/support-timespan

ruthra-kumar · Aug 8, 2023 · bc1d2bd · bc1d2bd
2 parents f818616 + b10a049
commit bc1d2bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -107,6 +107,8 @@ frappe.ui.form.on("Dashboard Chart", {
 		// set timeseries based on chart type
 		if (["Count", "Average", "Sum"].includes(frm.doc.chart_type)) {
 			frm.set_value("timeseries", 1);
+		} else if (frm.doc.chart_type == "Custom") {
+			return;
 		} else {
 			frm.set_value("timeseries", 0);
 		}

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -103,7 +103,7 @@ export default class ChartWidget extends Widget {
 				this.action_area.empty();
 				this.prepare_chart_actions();
 
-				if (this.chart_doc.timeseries && this.chart_doc.chart_type !== "Custom") {
+				if (this.chart_doc.timeseries) {
 					this.render_time_series_filters();
 				}
 			}