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

Merge pull request #239 from frappe/develop

Browse Source 
chore: Merge develop to main
This commit is contained in:
Shariq Ansari 2024-07-01 19:35:07 +05:30 committed by GitHub
commit 87e0aa2cf5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,10 +467,10 @@ list.value = createResource({
view_type: cv?.type || route.params.viewType || 'list',
group_by_field: params?.view?.group_by_field || 'owner',
},
column_field: params.column_field,
title_field: params.title_field,
kanban_columns: params.kanban_columns,
kanban_fields: params.kanban_fields,
column_field: data.column_field,
title_field: data.title_field,
kanban_columns: data.kanban_columns,
kanban_fields: data.kanban_fields,
columns: data.columns,
rows: data.rows,
page_length: params.page_length,
@ -799,7 +799,7 @@ async function updateKanbanSettings(data) {
}
function loadMoreKanban(columnName) {
let columns = list.value.params.kanban_columns
let columns = list.value.data.kanban_columns || "[]"
if (typeof columns === 'string') {
columns = JSON.parse(columns)