diff --git a/desk/src/components/ListViewBuilder.vue b/desk/src/components/ListViewBuilder.vue index da0ed305b..7071fe258 100644 --- a/desk/src/components/ListViewBuilder.vue +++ b/desk/src/components/ListViewBuilder.vue @@ -403,9 +403,10 @@ function updateColumns(obj) { handleColumnConfig(column); return column; }); - columns.value = _columns; - list.data.columns = _columns; - defaultParams.columns = _columns; + columns.value = + list.data.columns = + defaultParams.columns = + isDefault ? "" : obj.columns; if (reload) { list.reload({ ...defaultParams }); } diff --git a/desk/src/components/MultipleAvatar.vue b/desk/src/components/MultipleAvatar.vue index eec6b9fde..aa4115de5 100644 --- a/desk/src/components/MultipleAvatar.vue +++ b/desk/src/components/MultipleAvatar.vue @@ -57,9 +57,9 @@ const _avatars = computed(() => { result = props.avatars; } if (!result) return; - // if (typeof result === "object") { - // return; - // } + if (result[0].hasOwnProperty("name")) { + return result; + } result = result.map((a: string) => { let _user = getUser(a); return { diff --git a/desk/src/components/view-controls/ColumnSettings.vue b/desk/src/components/view-controls/ColumnSettings.vue index e2a9ae20d..6977c1b7c 100644 --- a/desk/src/components/view-controls/ColumnSettings.vue +++ b/desk/src/components/view-controls/ColumnSettings.vue @@ -296,7 +296,7 @@ watchOnce( if (!val) return; oldValues.value.columns = JSON.parse(JSON.stringify(val.columns)); oldValues.value.rows = JSON.parse(JSON.stringify(val.data)); - oldValues.value.isDefault = val.is_default; + oldValues.value.isDefault = val.is_default ?? false; } );