From d51f0306760b4ec2427681e0fb92c003f0248890 Mon Sep 17 00:00:00 2001 From: shriharishastry Date: Sat, 14 Jul 2018 18:47:45 +0530 Subject: [PATCH] [background-report] minor cleanup stage 2 --- frappe/desk/query_report.py | 2 +- frappe/public/js/frappe/query_string.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 0d031fd9f6..c36405588e 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -63,7 +63,7 @@ def generate_report_result(report, filters=None, user=None): # The JOB: try: res = frappe.get_attr(method_name)(frappe._dict(filters)) - except: + except Exception: report.prepared_report = 1 report.save() frappe.throw("The report to too long to load. Please reload the page to generate it in background.") diff --git a/frappe/public/js/frappe/query_string.js b/frappe/public/js/frappe/query_string.js index 8dbf5589a4..85aa09b0ef 100644 --- a/frappe/public/js/frappe/query_string.js +++ b/frappe/public/js/frappe/query_string.js @@ -7,8 +7,7 @@ function get_url_arg(name) { function get_query_string(url) { if(url.includes("?")) { return url.slice(url.indexOf("?")+1); - } - else { + }else { return ""; } }