From 019619958a8a32a3dc38df414f13d62a1c79f493 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 18 Jul 2017 16:37:09 +0530 Subject: [PATCH 1/2] [Fix] Unable to open calendar view of the task (#3727) --- frappe/desk/reportview.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 26c81bdbeb..ae5f378aa2 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -336,6 +336,9 @@ def build_match_conditions(doctype, as_condition=True): def get_filters_cond(doctype, filters, conditions, ignore_permissions=None, with_match_conditions=False): if filters: + if isinstance(filters, basestring): + filters = json.loads(filters) + flt = filters if isinstance(filters, dict): filters = filters.items() From c512cd4718a04aaf4fe9f812dc198f006fed78a0 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Tue, 18 Jul 2017 17:07:49 +0600 Subject: [PATCH 2/2] bumped to version 8.5.2 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 4b9a796690..8b6c21062a 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '8.5.1' +__version__ = '8.5.2' __title__ = "Frappe Framework" local = Local()