From 3de3ce02302c0b19220a14b7e3602cbaeca1e807 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 17 Sep 2019 22:23:24 +0530 Subject: [PATCH 1/2] fix(report-view): show export all checkbox only if total row count exceeds page length --- .../js/frappe/views/reports/report_view.js | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index ad4380bb4a..aa0a17b7a2 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -1231,23 +1231,27 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { action: () => { const args = this.get_args(); const selected_items = this.get_checked_items(true); + let fields = [ + { + fieldtype: 'Select', + label: __('Select File Type'), + fieldname:'file_format_type', + options: ['Excel', 'CSV'], + default: 'Excel' + } + ] + + if (this.total_count > args.page_length) { + fields.push({ + fieldtype: 'Check', + fieldname: 'export_all_rows', + label: __('Export All {0} rows?', [(this.total_count + "").bold()]) + }); + } const d = new frappe.ui.Dialog({ title: __("Export Report: {0}",[__(this.doctype)]), - fields: [ - { - fieldtype: 'Select', - label: __('Select File Type'), - fieldname:'file_format_type', - options: ['Excel', 'CSV'], - default: 'Excel' - }, - { - fieldtype: 'Check', - fieldname: 'export_all_rows', - label: __('Export All {0} rows?', [(this.total_count + "").bold()]) - } - ], + fields: fields, primary_action_label: __('Download'), primary_action: (data) => { args.cmd = 'frappe.desk.reportview.export_query'; From e6055d406e87c4c77e883ad730379c687528ed8b Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 18 Sep 2019 11:56:16 +0530 Subject: [PATCH 2/2] fix: codacy --- frappe/public/js/frappe/views/reports/report_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index aa0a17b7a2..6ac26c00da 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -1239,7 +1239,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { options: ['Excel', 'CSV'], default: 'Excel' } - ] + ]; if (this.total_count > args.page_length) { fields.push({