From 2acaf1a464e570e5598ccbf307da3f8d8a8f2da4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 30 Mar 2021 15:50:47 +0530 Subject: [PATCH] fix(minor): tests (cherry picked from commit 868228bdea0b043402d53223685a28eaa2760980) --- frappe/desk/reportview.py | 11 ++++++++--- frappe/frappeclient.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 64413b2728..fd61224b19 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -60,9 +60,11 @@ def validate_args(data): def validate_fields(data): expand_fields(data) - update_star_field_param(data) + if update_wildcard_field_param(data): + # no need to validate wildcard fields + return - for field in data.fields: + for field in data.fields or []: fieldname = extract_fieldname(field) if is_standard(fieldname): continue @@ -163,10 +165,13 @@ def get_meta_and_docfield(fieldname, data): df = meta.get_field(fieldname) return meta, df -def update_star_field_param(data): +def update_wildcard_field_param(data): if ((isinstance(data.fields, string_types) and data.fields == "*") or (isinstance(data.fields, (list, tuple)) and len(data.fields) == 1 and data.fields[0] == "*")): data.fields = frappe.db.get_table_columns(data.doctype) + return True + + return False def clean_params(data): diff --git a/frappe/frappeclient.py b/frappe/frappeclient.py index 919c334e51..054a8c9369 100644 --- a/frappe/frappeclient.py +++ b/frappe/frappeclient.py @@ -86,7 +86,7 @@ class FrappeClient(object): 'cmd': 'logout', }, verify=self.verify, headers=self.headers) - def get_list(self, doctype, fields='"*"', filters=None, limit_start=0, limit_page_length=0): + def get_list(self, doctype, fields='["name"]', filters=None, limit_start=0, limit_page_length=0): """Returns list of records of a particular type""" if not isinstance(fields, string_types): fields = json.dumps(fields)