vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: attempt to not pass an empty string to json.loads (#23139) (#23141)

Browse source 
* fix: attempt to not pass an empty string to `json.loads`

* fix: ignore all falsy fields

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 6a8cf0689ae8e70f99ffd6957603d6583b4bdf92)

Co-authored-by: Arjun <contact@arjunchoudhary.com>
This commit is contained in:
mergify[bot] 2023-11-07 20:04:20 +05:30 • committed by GitHub
parent 67bac7863e
commit d3c534e0cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frappe/desk/reportview.py
View file

@ -215,12 +215,12 @@ def clean_params(data):
def parse_json(data):
if isinstance(data.get("filters"), str):
data["filters"] = json.loads(data["filters"])
if isinstance(data.get("or_filters"), str):
data["or_filters"] = json.loads(data["or_filters"])
if isinstance(data.get("fields"), str):
data["fields"] = ["*"] if data["fields"] == "*" else json.loads(data["fields"])
if (filters := data.get("filters")) and isinstance(filters, str):
data["filters"] = json.loads(filters)
if (or_filters := data.get("or_filters")) and isinstance(or_filters, str):
data["or_filters"] = json.loads(or_filters)
if (fields := data.get("fields")) and isinstance(fields, str):
data["fields"] = ["*"] if fields == "*" else json.loads(fields)
if isinstance(data.get("docstatus"), str):
data["docstatus"] = json.loads(data["docstatus"])
if isinstance(data.get("save_user_settings"), str):