test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: renamed default_columns field to load_default_columns

Browse Source
This commit is contained in:
Shariq Ansari 2024-01-03 17:02:04 +05:30
parent 3c27169d12
commit 946c30b387
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crm/api/doc.py
View File

@ -134,7 +134,7 @@ def get_list_data(doctype: str, filters: dict, order_by: str, columns=None , row
fields.append(field) fields.append(field)
if not is_default and custom_view_name: 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 { return {
"data": data, "data": data,

16
crm/fcrm/doctype/crm_view_settings/crm_view_settings.json
View File

@ -12,7 +12,7 @@
"route_name", "route_name",
"pinned", "pinned",
"columns_tab", "columns_tab",
"default_columns", "load_default_columns",
"columns", "columns",
"rows", "rows",
"filters_tab", "filters_tab",
@ -81,12 +81,6 @@
"fieldtype": "Code", "fieldtype": "Code",
"label": "Order By" "label": "Order By"
}, },
{
"default": "0",
"fieldname": "default_columns",
"fieldtype": "Check",
"label": "Default Columns"
},
{ {
"default": "0", "default": "0",
"fieldname": "pinned", "fieldname": "pinned",
@ -97,11 +91,17 @@
"fieldname": "route_name", "fieldname": "route_name",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Route Name" "label": "Route Name"
},
{
"default": "0",
"fieldname": "load_default_columns",
"fieldtype": "Check",
"label": "Load Default Columns"
} }
], ],
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2024-01-01 18:44:22.815490", "modified": "2024-01-03 16:54:52.195687",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "FCRM", "module": "FCRM",
"name": "CRM View Settings", "name": "CRM View Settings",

4
crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
View File

@ -25,7 +25,7 @@ def create(view, duplicate=False):
doc.filters = json.dumps(view.filters) doc.filters = json.dumps(view.filters)
doc.order_by = view.order_by doc.order_by = view.order_by
doc.route_name = view.route_name or "" 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: if not view.columns:
view.columns = [] view.columns = []
@ -61,7 +61,7 @@ def update(view):
doc = frappe.get_doc("CRM View Settings", view.name) doc = frappe.get_doc("CRM View Settings", view.name)
doc.label = view.label doc.label = view.label
doc.route_name = view.route_name or "" 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.filters = json.dumps(filters)
doc.order_by = view.order_by doc.order_by = view.order_by
doc.columns = json.dumps(columns) doc.columns = json.dumps(columns)

10
frontend/src/components/ViewControls.vue
View File

@ -121,7 +121,7 @@ const view = ref({
order_by: 'modified desc', order_by: 'modified desc',
columns: '', columns: '',
rows: '', rows: '',
default_columns: false, load_default_columns: false,
pinned: false, pinned: false,
}) })
@ -141,7 +141,7 @@ function getParams() {
columns: _view.columns, columns: _view.columns,
rows: _view.rows, rows: _view.rows,
route_name: _view.route_name, route_name: _view.route_name,
default_columns: _view.row, load_default_columns: _view.row,
pinned: _view.pinned, pinned: _view.pinned,
} }
} else { } else {
@ -153,7 +153,7 @@ function getParams() {
columns: '', columns: '',
rows: '', rows: '',
route_name: '', route_name: '',
default_columns: true, load_default_columns: true,
pinned: false, pinned: false,
} }
} }
@ -272,7 +272,7 @@ function updateSort(order_by) {
function updateColumns(obj) { function updateColumns(obj) {
defaultParams.value.columns = obj.isDefault ? '' : obj.columns defaultParams.value.columns = obj.isDefault ? '' : obj.columns
defaultParams.value.rows = obj.isDefault ? '' : obj.rows defaultParams.value.rows = obj.isDefault ? '' : obj.rows
view.value.default_columns = obj.isDefault view.value.load_default_columns = obj.isDefault
if (obj.reset) { if (obj.reset) {
defaultParams.value.columns = getParams().columns defaultParams.value.columns = getParams().columns
@ -375,7 +375,7 @@ function saveView() {
columns: defaultParams.value.columns, columns: defaultParams.value.columns,
rows: defaultParams.value.rows, rows: defaultParams.value.rows,
route_name: route.name, route_name: route.name,
default_columns: view.value.default_columns, load_default_columns: view.value.load_default_columns,
} }
showViewModal.value = true showViewModal.value = true
} }