From 19c1501eba293f627868defad09f505c32109e6b Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 20 Feb 2025 15:38:41 +0530 Subject: [PATCH] fix: set default column_field, order_by & group_by_field if not set --- .../doctype/crm_view_settings/crm_view_settings.json | 3 +-- crm/fcrm/doctype/crm_view_settings/crm_view_settings.py | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json index 7beefffb..e8b9d8cc 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json @@ -169,7 +169,6 @@ "label": "Kanban Fields" }, { - "default": "name", "fieldname": "title_field", "fieldtype": "Data", "label": "Title Field" @@ -189,7 +188,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2025-02-20 12:52:27.522624", + "modified": "2025-02-20 15:36:55.059065", "modified_by": "Administrator", "module": "FCRM", "name": "CRM View Settings", 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 d340fff7..2552b901 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -171,6 +171,7 @@ def create_or_update_standard_view(view): rows = parse_json(view.rows or "[]") kanban_columns = parse_json(view.kanban_columns or "[]") kanban_fields = parse_json(view.kanban_fields or "[]") + view.column_field = view.column_field or "status" default_rows = sync_default_rows(view.doctype, view.type) rows = rows + default_rows if default_rows else rows @@ -192,8 +193,8 @@ def create_or_update_standard_view(view): doc.route_name = view.route_name or get_route_name(view.doctype) doc.load_default_columns = view.load_default_columns or False doc.filters = json.dumps(filters) - doc.order_by = view.order_by - doc.group_by_field = view.group_by_field + doc.order_by = view.order_by or "modified desc" + doc.group_by_field = view.group_by_field or "owner" doc.column_field = view.column_field doc.title_field = view.title_field doc.kanban_columns = json.dumps(kanban_columns) @@ -219,8 +220,8 @@ def create_or_update_standard_view(view): doc.route_name = view.route_name or get_route_name(view.doctype) doc.load_default_columns = view.load_default_columns or False doc.filters = json.dumps(filters) - doc.order_by = view.order_by - doc.group_by_field = view.group_by_field + doc.order_by = view.order_by or "modified desc" + doc.group_by_field = view.group_by_field or "owner" doc.column_field = view.column_field doc.title_field = view.title_field doc.kanban_columns = json.dumps(kanban_columns)