From 020bd60fab36c2fe2c993ce779b62f7d536f2354 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Sat, 22 Jun 2024 14:45:37 +0530 Subject: [PATCH] fix: use default_list_rows for kanban --- crm/api/doc.py | 4 ++-- crm/fcrm/doctype/crm_deal/crm_deal.py | 15 +-------------- crm/fcrm/doctype/crm_lead/crm_lead.py | 14 -------------- crm/fcrm/doctype/crm_task/crm_task.py | 13 ------------- .../crm_view_settings/crm_view_settings.py | 4 +--- 5 files changed, 4 insertions(+), 46 deletions(-) diff --git a/crm/api/doc.py b/crm/api/doc.py index 6b513952..57dc3684 100644 --- a/crm/api/doc.py +++ b/crm/api/doc.py @@ -312,8 +312,8 @@ def get_data( if not rows: rows = ["name"] - if hasattr(_list, "default_kanban_data"): - rows = _list.default_kanban_data().get("rows") + if hasattr(_list, "default_list_data"): + rows = _list.default_list_data().get("rows") if "name" not in rows: rows.append("name") diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.py b/crm/fcrm/doctype/crm_deal/crm_deal.py index 07d9f4cb..f8e05561 100644 --- a/crm/fcrm/doctype/crm_deal/crm_deal.py +++ b/crm/fcrm/doctype/crm_deal/crm_deal.py @@ -189,20 +189,7 @@ class CRMDeal(Document): "_assign", ] return {'columns': columns, 'rows': rows} - - @staticmethod - def default_kanban_data(): - rows = [ - "name", - "lead_name", - "organization", - "annual_revenue", - "email", - "mobile_no", - "deal_owner", - "modified", - ] - return {'rows': rows} + @frappe.whitelist() def add_contact(deal, contact): diff --git a/crm/fcrm/doctype/crm_lead/crm_lead.py b/crm/fcrm/doctype/crm_lead/crm_lead.py index 9429da59..f4ebe162 100644 --- a/crm/fcrm/doctype/crm_lead/crm_lead.py +++ b/crm/fcrm/doctype/crm_lead/crm_lead.py @@ -324,20 +324,6 @@ class CRMLead(Document): ] return {'columns': columns, 'rows': rows} - @staticmethod - def default_kanban_data(): - rows = [ - "name", - "lead_name", - "organization", - "email", - "mobile_no", - "lead_owner", - "modified", - "image", - ] - return {'rows': rows} - @frappe.whitelist() def convert_to_deal(lead, doc=None): if not (doc and doc.flags.get("ignore_permissions")) and not frappe.has_permission("CRM Lead", "write", lead): diff --git a/crm/fcrm/doctype/crm_task/crm_task.py b/crm/fcrm/doctype/crm_task/crm_task.py index 5c702b30..1559ff3e 100644 --- a/crm/fcrm/doctype/crm_task/crm_task.py +++ b/crm/fcrm/doctype/crm_task/crm_task.py @@ -60,16 +60,3 @@ class CRMTask(Document): "modified", ] return {'columns': columns, 'rows': rows} - - @staticmethod - def default_kanban_data(): - rows = [ - "name", - "title", - "description", - "assigned_to", - "due_date", - "priority", - "modified", - ] - return {'rows': rows} diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py index 120e04d5..a82f6af8 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -97,9 +97,7 @@ def sync_default_rows(doctype, type="list"): list = get_controller(doctype) rows = [] - if type == "kanban" and hasattr(list, "default_kanban_data"): - rows = list.default_kanban_data().get("rows") - elif hasattr(list, "default_list_data"): + if hasattr(list, "default_list_data"): rows = list.default_list_data().get("rows") return rows