Skip to content

Commit

Permalink
Merge pull request #239 from frappe/develop
Browse files Browse the repository at this point in the history
chore: Merge develop to main
  • Loading branch information
shariquerik authored Jul 1, 2024
2 parents 1738e41 + 4e3543b commit 87e0aa2
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions frontend/src/components/ViewControls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 87e0aa2

Please sign in to comment.