test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: load list data from crm list view settings doctype

Browse Source
This commit is contained in:
Shariq Ansari 2023-11-27 18:59:10 +05:30
parent e311637176
commit 671710e71c
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crm/api/doc.py
View File

@ -55,14 +55,18 @@ def get_list_data(doctype: str, filters: dict, order_by: str):
data_fields = []
list = get_controller(doctype)
if frappe.db.exists("CRM List View Settings", doctype):
list_view_settings = frappe.get_doc("CRM List View Settings", doctype)
columns = frappe.parse_json(list_view_settings.columns)
data_fields = frappe.parse_json(list_view_settings.data_fields)
else:
list = get_controller(doctype)
if hasattr(list, "default_list_data"):
columns = list.default_list_data().get("columns")
data_fields = list.default_list_data().get("data_fields")
if hasattr(list, "default_list_data"):
columns = list.default_list_data().get("columns")
data_fields = list.default_list_data().get("data_fields")
rows = [i['key'] for i in columns]
rows = rows + data_fields
rows = [i['key'] for i in columns] + data_fields
data = frappe.get_all(
doctype,

10
crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.json
View File

@ -7,7 +7,8 @@
"engine": "InnoDB",
"field_order": [
"user",
"columns"
"columns",
"data_fields"
],
"fields": [
{
@ -20,11 +21,16 @@
"fieldtype": "Link",
"label": "User",
"options": "User"
},
{
"fieldname": "data_fields",
"fieldtype": "Code",
"label": "Data Fields"
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2023-11-27 16:34:16.393091",
"modified": "2023-11-27 18:47:23.123396",
"modified_by": "Administrator",
"module": "FCRM",
"name": "CRM List View Settings",