From a3ee5ab6df9dffb3c8b38693a389acd7703f107a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 15 Apr 2019 14:38:09 +0530 Subject: [PATCH 1/4] fix: save button should not remain disabled when the system is offline --- frappe/public/js/frappe/request.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js index cd102117d7..dd92e4109c 100644 --- a/frappe/public/js/frappe/request.js +++ b/frappe/public/js/frappe/request.js @@ -30,7 +30,8 @@ frappe.call = function(opts) { indicator: 'orange', message: __('You are not connected to Internet. Retry after sometime.') }, 3); - return; + opts.always && opts.always(); + return $.ajax(); } if (typeof arguments[0]==='string') { opts = { From 64187bb451d57384100c5e8e206524e7b59bab21 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Tue, 16 Apr 2019 12:53:37 +0530 Subject: [PATCH 2/4] fix: Custom columns handling for prepared report --- frappe/core/doctype/prepared_report/prepared_report.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py index 1cd106dabd..5217a6537d 100644 --- a/frappe/core/doctype/prepared_report/prepared_report.py +++ b/frappe/core/doctype/prepared_report/prepared_report.py @@ -37,6 +37,15 @@ class PreparedReport(Document): def run_background(instance): report = frappe.get_doc("Report", instance.ref_report_doctype) + + report.custom_columns = [] + + if report.report_type == 'Custom Report': + custom_report_doc = report + reference_report = custom_report_doc.reference_report + report = frappe.get_doc("Report", reference_report) + report.custom_columns = custom_report_doc.json + result = generate_report_result(report, filters=instance.filters, user=instance.owner) create_json_gz_file(result['result'], 'Prepared Report', instance.name) From 30639dd261c6cd1022d419cc593ca76884e1d1e3 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 16 Apr 2019 16:07:05 +0530 Subject: [PATCH 3/4] fix: Remove projectId to disable recording --- cypress.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cypress.json b/cypress.json index bd93405273..5348a69bc0 100644 --- a/cypress.json +++ b/cypress.json @@ -1,4 +1,3 @@ { - "baseUrl": "http://test_site_ui:8000", - "projectId": "92odwv" + "baseUrl": "http://test_site_ui:8000" } From 7a7ac3b85f3273b1da191e0ff71131a780ad8cf5 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 16 Apr 2019 18:39:22 +0530 Subject: [PATCH 4/4] fix: Remove --record flag --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f0ae54aa59..5be452ace0 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "build": "node rollup/build.js", "production": "FRAPPE_ENV=production node rollup/build.js", "watch": "node rollup/watch.js", - "cypress:run": "cypress run --record --key 14ddd919-b01f-4d5f-b9d1-5af54d34c7f3", + "cypress:run": "cypress run", "cypress:open": "cypress open" }, "repository": {