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

fix: filter out standard dashboards while creating from reports

Browse source
This commit is contained in:
prssanna 2020-07-22 11:42:13 +05:30
parent 1e56fcc857
commit cdd7cb2f17
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -157,6 +157,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
add_card_to_dashboard() {
let field_options = frappe.report_utils.get_field_options_from_report(this.columns, this.raw_data);
const dashboard_field = frappe.dashboard_utils.get_dashboard_link_field();
const set_standard = frappe.boot.developer_mode;
const dialog = new frappe.ui.Dialog({
title: __('Create Card'),
fields: [
@ -181,12 +184,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
label: __('Add to Dashboard'),
fieldtype: 'Section Break'
},
{
fieldname: 'dashboard',
label: __('Choose Dashboard'),
fieldtype: 'Link',
options: 'Dashboard',
},
dashboard_field,
{
fieldname: 'cb_2',
fieldtype: 'Column Break'
@ -202,7 +200,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
if (!values.label) {
values.label = `${values.report_function} of ${toTitle(values.report_field)}`;
}
this.create_number_card(values, values.dashboard, values.label);
this.create_number_card(values, values.dashboard, values.label, set_standard);
dialog.hide();
}
});
@ -213,27 +211,26 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
add_chart_to_dashboard() {
if (this.chart_fields || this.chart_options) {
const dashboard_field = frappe.dashboard_utils.get_dashboard_link_field();
const set_standard = frappe.boot.developer_mode;
const dialog = new frappe.ui.Dialog({
title: __('Create Chart'),
fields: [
{
fieldname: 'dashboard',
label: 'Choose Dashboard',
fieldtype: 'Link',
options: 'Dashboard',
},
{
fieldname: 'dashboard_chart_name',
label: 'Chart Name',
fieldtype: 'Data',
}
},
dashboard_field,
],
primary_action_label: __('Add'),
primary_action: (values) => {
this.create_dashboard_chart(
this.chart_fields || this.chart_options,
values.dashboard,
values.dashboard_chart_name
values.dashboard_chart_name,
set_standard
);
dialog.hide();
}
@ -245,12 +242,13 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
}
}
create_number_card(values, dashboard_name, card_name) {
create_number_card(values, dashboard_name, card_name, set_standard) {
let args = {
'dashboard': dashboard_name || null,
'type': 'Report',
'report_name': this.report_name,
'filters_json': JSON.stringify(this.get_filter_values()),
set_standard: set_standard,
};
Object.assign(args, values);
@ -263,7 +261,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
);
}
create_dashboard_chart(chart_args, dashboard_name, chart_name) {
create_dashboard_chart(chart_args, dashboard_name, chart_name, set_standard) {
let args = {
'dashboard': dashboard_name || null,
'chart_type': 'Report',
@ -271,7 +269,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
'type': chart_args.chart_type || frappe.model.unscrub(chart_args.type),
'color': chart_args.color,
'filters_json': JSON.stringify(this.get_filter_values()),
'custom_options': {}
'custom_options': {},
'set_standard': set_standard,
};
for (let key in chart_args) {