test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

fix: get views data along with doc data also handle loading of columns based on custom view

Browse Source
This commit is contained in:
Shariq Ansari 2023-12-31 17:53:49 +05:30
parent 25e92fed45
commit 8660312684
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crm/api/doc.py
View File

@ -56,21 +56,31 @@ def get_filterable_fields(doctype: str):
@frappe.whitelist() @frappe.whitelist()
def get_list_data(doctype: str, filters: dict, order_by: str): def get_list_data(doctype: str, filters: dict, order_by: str, columns=None , rows=None, custom_view_name=None):
columns = [ custom_view = False
{"label": "Name", "type": "Data", "key": "name", "width": "16rem"}, filters = frappe._dict(filters)
{"label": "Last Modified", "type": "Datetime", "key": "modified", "width": "8rem"},
]
rows = ["name"]
is_default = True is_default = True
if columns or rows:
custom_view = True
is_default = False
columns = frappe.parse_json(columns)
rows = frappe.parse_json(rows)
if frappe.db.exists("CRM View Settings", doctype): if not columns:
columns = [
{"label": "Name", "type": "Data", "key": "name", "width": "16rem"},
{"label": "Last Modified", "type": "Datetime", "key": "modified", "width": "8rem"},
]
if not rows:
rows = ["name"]
if not custom_view and frappe.db.exists("CRM View Settings", doctype):
list_view_settings = frappe.get_doc("CRM View Settings", doctype) list_view_settings = frappe.get_doc("CRM View Settings", doctype)
columns = frappe.parse_json(list_view_settings.columns) columns = frappe.parse_json(list_view_settings.columns)
rows = frappe.parse_json(list_view_settings.rows) rows = frappe.parse_json(list_view_settings.rows)
is_default = False is_default = False
else: elif not custom_view or is_default:
list = get_controller(doctype) list = get_controller(doctype)
if hasattr(list, "default_list_data"): if hasattr(list, "default_list_data"):
@ -123,14 +133,22 @@ def get_list_data(doctype: str, filters: dict, order_by: str):
if field not in fields: if field not in fields:
fields.append(field) fields.append(field)
if not is_default and custom_view_name:
is_default = frappe.db.get_value("CRM View Settings", custom_view_name, "default_columns")
return { return {
"data": data, "data": data,
"columns": columns, "columns": columns,
"rows": rows, "rows": rows,
"fields": fields, "fields": fields,
"is_default": is_default, "is_default": is_default,
"views": get_views(doctype),
} }
def get_views(doctype):
views = frappe.get_all("CRM View Settings", fields=["*"], filters={"dt": doctype})
return views
def get_doctype_fields(doctype): def get_doctype_fields(doctype):
not_allowed_fieldtypes = [ not_allowed_fieldtypes = [