From 026f57d4ad4214371982185352cc6756c8a954c2 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 12 Apr 2018 17:50:02 +0530 Subject: [PATCH] [fix] Query Report data fetch (#5441) - fallback for user arg - also commit yarn.lock --- frappe/desk/reportview.py | 2 +- yarn.lock | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index c3b2d0a417..6716faee22 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -341,7 +341,7 @@ def get_match_cond(doctype): cond = DatabaseQuery(doctype).build_match_conditions() return ((' and ' + cond) if cond else "").replace("%", "%%") -def build_match_conditions(doctype, user, as_condition=True): +def build_match_conditions(doctype, user=None, as_condition=True): match_conditions = DatabaseQuery(doctype, user=user).build_match_conditions(as_condition=as_condition) if as_condition: return match_conditions.replace("%", "%%") diff --git a/yarn.lock b/yarn.lock index f4b1924311..48379243a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -862,14 +862,6 @@ forwarded@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" -frappe-datatable@^0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-0.0.4.tgz#3fdcd698c2cd7bf7d75e920ed9d2f04f69e3afc9" - dependencies: - clusterize.js "^0.18.0" - lodash "^4.17.5" - sortablejs "^1.7.0" - frappe-datatable@frappe/datatable: version "0.0.4" resolved "https://codeload.github.com/frappe/datatable/tar.gz/4bb400230087fbf97e8587a34916e14f77fa01cd"