diff --git a/crm/api/doc.py b/crm/api/doc.py index 8a162a35..4e420780 100644 --- a/crm/api/doc.py +++ b/crm/api/doc.py @@ -302,11 +302,11 @@ def get_data( if field_meta.fieldtype == "Link": columns = frappe.get_all( field_meta.options, - pluck="name", + fields=["name"], order_by="modified asc", ) elif field_meta.fieldtype == "Select": - columns = [option for option in field_meta.options.split("\n")] + columns = [{"name": option} for option in field_meta.options.split("\n")] if not rows: @@ -316,8 +316,8 @@ def get_data( rows = _list.default_kanban_data().get("rows") for column in columns: - column_filters = { column_field: column } - if column_field in filters and filters.get(column_field) != column: + column_filters = { column_field: column.get('name') } + if column_field in filters and filters.get(column_field) != column.name: column_data = [] else: column_filters.update(filters.copy()) 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 1908443a..120e04d5 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -113,11 +113,11 @@ def sync_default_columns(view): if field_meta.fieldtype == "Link": columns = frappe.get_all( field_meta.options, - pluck="name", + fields=["name"], order_by="modified asc", ) elif field_meta.fieldtype == "Select": - columns = [option for option in field_meta.options.split("\n")] + columns = [{"name": option} for option in field_meta.options.split("\n")] elif hasattr(list, "default_list_data"): columns = list.default_list_data().get("columns") diff --git a/frontend/src/components/Kanban/KanbanView.vue b/frontend/src/components/Kanban/KanbanView.vue index 8b75c8f0..1d1a1640 100644 --- a/frontend/src/components/Kanban/KanbanView.vue +++ b/frontend/src/components/Kanban/KanbanView.vue @@ -1,22 +1,35 @@