From 8c8385a37b0e371d556e199be755c6b4a9411081 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 19 Jul 2017 12:32:55 +0530 Subject: [PATCH] [Fix] Calender view broken if filters has not applied (#3737) --- frappe/desk/reportview.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index ae5f378aa2..fbb363300f 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -335,10 +335,10 @@ def build_match_conditions(doctype, as_condition=True): return match_conditions def get_filters_cond(doctype, filters, conditions, ignore_permissions=None, with_match_conditions=False): - if filters: - if isinstance(filters, basestring): - filters = json.loads(filters) + if isinstance(filters, basestring): + filters = json.loads(filters) + if filters: flt = filters if isinstance(filters, dict): filters = filters.items() @@ -363,4 +363,3 @@ def get_filters_cond(doctype, filters, conditions, ignore_permissions=None, with else: cond = '' return cond -