Преглед изворни кода

[Fix] Calender view broken if filters has not applied (#3737)

version-14
rohitwaghchaure пре 8 година
committed by Makarand Bauskar
родитељ
комит
8c8385a37b
1 измењених фајлова са 3 додато и 4 уклоњено
  1. +3
    -4
      frappe/desk/reportview.py

+ 3
- 4
frappe/desk/reportview.py Прегледај датотеку

@@ -335,10 +335,10 @@ def build_match_conditions(doctype, as_condition=True):
return match_conditions return match_conditions


def get_filters_cond(doctype, filters, conditions, ignore_permissions=None, with_match_conditions=False): 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 flt = filters
if isinstance(filters, dict): if isinstance(filters, dict):
filters = filters.items() filters = filters.items()
@@ -363,4 +363,3 @@ def get_filters_cond(doctype, filters, conditions, ignore_permissions=None, with
else: else:
cond = '' cond = ''
return cond return cond


Loading…
Откажи
Сачувај