From 671710e71c20dd14d9c98f60642b2565be7391ad Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 27 Nov 2023 18:59:10 +0530
Subject: [PATCH] fix: load list data from crm list view settings doctype

---
 crm/api/doc.py                                   | 16 ++++++++++------
 .../crm_list_view_settings.json                  | 10 ++++++++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/crm/api/doc.py b/crm/api/doc.py
index 6b012bdc..b6e7d8d7 100644
--- a/crm/api/doc.py
+++ b/crm/api/doc.py
@@ -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,
diff --git a/crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.json b/crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.json
index 47675244..11727649 100644
--- a/crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.json
+++ b/crm/fcrm/doctype/crm_list_view_settings/crm_list_view_settings.json
@@ -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",