From 0a68539c47aeed43d3e96c2df5ac0299ba9ece4f Mon Sep 17 00:00:00 2001 From: shriharishastry Date: Sat, 14 Jul 2018 18:38:19 +0530 Subject: [PATCH] [background-report] minor cleanup --- .../doctype/chat_token/test_chat_token.py | 10 -------- .../core/doctype/data_export/data_export.json | 2 +- .../js/frappe/views/reports/query_report.js | 25 +++++++++---------- 3 files changed, 13 insertions(+), 24 deletions(-) delete mode 100644 frappe/chat/doctype/chat_token/test_chat_token.py diff --git a/frappe/chat/doctype/chat_token/test_chat_token.py b/frappe/chat/doctype/chat_token/test_chat_token.py deleted file mode 100644 index 5bd97436ae..0000000000 --- a/frappe/chat/doctype/chat_token/test_chat_token.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -import frappe -import unittest - -class TestChatToken(unittest.TestCase): - pass diff --git a/frappe/core/doctype/data_export/data_export.json b/frappe/core/doctype/data_export/data_export.json index f106a0ce02..8304430fdb 100644 --- a/frappe/core/doctype/data_export/data_export.json +++ b/frappe/core/doctype/data_export/data_export.json @@ -168,7 +168,7 @@ "set_only_once": 0, "translatable": 0, "unique": 0 - }, + }, { "allow_bulk_edit": 0, "allow_on_submit": 0, diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index d078436da0..d09aafed34 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -265,29 +265,28 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } add_prepared_report_buttons(doc) { - if(doc){ - this.page.add_inner_button(__("Download Report"), function (){ - frappe.call({ - method:"frappe.core.doctype.prepared_report.prepared_report.download_attachment", - args: {"dn": flags.name} - }); - }); + if(doc){ + this.page.add_inner_button(__("Download Report"), function () { + frappe.call({ + method:"frappe.core.doctype.prepared_report.prepared_report.download_attachment", + args: {"dn": doc.name} + }); + }); frappe.route_options = { report_name: doc.report_name, filters: doc.filters }; - - let filters = JSON.parse(JSON.parse(doc.filters)); - - this.set_filters(filters); + let filters = JSON.parse(JSON.parse(doc.filters)); + this.set_filters(filters); + this.show_status(__(` This report was generated on ${frappe.datetime.convert_to_user_tz(doc.report_end_time)}. See all past reports. `)); - } + } this.page.add_inner_button(__("Generate New Report"), () => { let mandatory = this.filters.filter(f => f.df.reqd); @@ -311,7 +310,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { }); } }, "", "primary"); - } + } render_report(data) { this.columns = this.prepare_columns(data.columns);