Parcourir la source

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

version-14
rohitwaghchaure il y a 8 ans
committed by Makarand Bauskar
Parent
révision
8c8385a37b
1 fichiers modifiés avec 3 ajouts et 4 suppressions
  1. +3
    -4
      frappe/desk/reportview.py

+ 3
- 4
frappe/desk/reportview.py Voir le fichier

@@ -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


Chargement…
Annuler
Enregistrer