fix: multiple avatar component props handeling

frappe · Feb 5, 2025 · 1b89567 · 1b89567
1 parent 233255e
commit 1b89567
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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;
   }
 );
 </script>