diff --git a/frappe/core/doctype/system_settings/system_settings.js b/frappe/core/doctype/system_settings/system_settings.js index d2fe3cba69..eebc984a2f 100644 --- a/frappe/core/doctype/system_settings/system_settings.js +++ b/frappe/core/doctype/system_settings/system_settings.js @@ -29,7 +29,7 @@ frappe.ui.form.on("System Settings", "enable_two_factor_auth", function(frm) { }); frappe.ui.form.on("System Settings", "enable_prepared_report_auto_deletion", function(frm) { - if(frm.doc.enable_prepared_report_auto_deletion){ + if (frm.doc.enable_prepared_report_auto_deletion) { if (!frm.doc.prepared_report_expiry_period) { frm.set_value('prepared_report_expiry_period', 30); } diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index 01e8fdbb98..be69775b26 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -185,8 +185,8 @@ frappe.ui.form.Toolbar = Class.extend({ return this.page.add_dropdown(label); }, set_indicator: function() { - if(this.frm.save_disabled) - return; + // if(this.frm.save_disabled) + // return; var indicator = frappe.get_indicator(this.frm.doc); if(indicator) { diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 30e2021045..9f2378e109 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -680,7 +680,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.show_warning_or_generate_report(); } } - } + }; + let primary_action = this.primary_action_map[this.prepared_report_action]; if (!this.primary_button || this.primary_button.text() !== primary_action.label) {