diff --git a/crm/api/doc.py b/crm/api/doc.py index eb963a63..9a47b355 100644 --- a/crm/api/doc.py +++ b/crm/api/doc.py @@ -134,7 +134,7 @@ def get_list_data(doctype: str, filters: dict, order_by: str, columns=None , row fields.append(field) if not is_default and custom_view_name: - is_default = frappe.db.get_value("CRM View Settings", custom_view_name, "default_columns") + is_default = frappe.db.get_value("CRM View Settings", custom_view_name, "load_default_columns") return { "data": data, 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 91ed5b31..6cbc383e 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json @@ -12,7 +12,7 @@ "route_name", "pinned", "columns_tab", - "default_columns", + "load_default_columns", "columns", "rows", "filters_tab", @@ -81,12 +81,6 @@ "fieldtype": "Code", "label": "Order By" }, - { - "default": "0", - "fieldname": "default_columns", - "fieldtype": "Check", - "label": "Default Columns" - }, { "default": "0", "fieldname": "pinned", @@ -97,11 +91,17 @@ "fieldname": "route_name", "fieldtype": "Data", "label": "Route Name" + }, + { + "default": "0", + "fieldname": "load_default_columns", + "fieldtype": "Check", + "label": "Load Default Columns" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-01-01 18:44:22.815490", + "modified": "2024-01-03 16:54:52.195687", "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 198379cf..297a6d44 100644 --- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py +++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py @@ -25,7 +25,7 @@ def create(view, duplicate=False): doc.filters = json.dumps(view.filters) doc.order_by = view.order_by doc.route_name = view.route_name or "" - doc.default_columns = view.default_columns or False + doc.load_default_columns = view.load_default_columns or False if not view.columns: view.columns = [] @@ -61,7 +61,7 @@ def update(view): doc = frappe.get_doc("CRM View Settings", view.name) doc.label = view.label doc.route_name = view.route_name or "" - doc.default_columns = default_columns + doc.load_default_columns = view.load_default_columns or False doc.filters = json.dumps(filters) doc.order_by = view.order_by doc.columns = json.dumps(columns) diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue index 0aeb8215..495be54e 100644 --- a/frontend/src/components/ViewControls.vue +++ b/frontend/src/components/ViewControls.vue @@ -121,7 +121,7 @@ const view = ref({ order_by: 'modified desc', columns: '', rows: '', - default_columns: false, + load_default_columns: false, pinned: false, }) @@ -141,7 +141,7 @@ function getParams() { columns: _view.columns, rows: _view.rows, route_name: _view.route_name, - default_columns: _view.row, + load_default_columns: _view.row, pinned: _view.pinned, } } else { @@ -153,7 +153,7 @@ function getParams() { columns: '', rows: '', route_name: '', - default_columns: true, + load_default_columns: true, pinned: false, } } @@ -272,7 +272,7 @@ function updateSort(order_by) { function updateColumns(obj) { defaultParams.value.columns = obj.isDefault ? '' : obj.columns defaultParams.value.rows = obj.isDefault ? '' : obj.rows - view.value.default_columns = obj.isDefault + view.value.load_default_columns = obj.isDefault if (obj.reset) { defaultParams.value.columns = getParams().columns @@ -375,7 +375,7 @@ function saveView() { columns: defaultParams.value.columns, rows: defaultParams.value.rows, route_name: route.name, - default_columns: view.value.default_columns, + load_default_columns: view.value.load_default_columns, } showViewModal.value = true }