Merge pull request #45029 from nextcloud/backport/44972/master

fix(unifiedSearch): Prevent broken avatars for federated users
nextcloud · Apr 29, 2024 · 7bd35e0 · 7bd35e0
2 parents 2c059dd + ff49d19
commit 7bd35e0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/core/src/components/UnifiedSearch/SearchableList.vue b/core/src/components/UnifiedSearch/SearchableList.vue
@@ -46,7 +46,11 @@
 						:wide="true"
 						@click="itemSelected(element)">
 						<template #icon>
-							<NcAvatar :user="element.user" :show-user-status="false" :hide-favorite="false" />
+							<NcAvatar v-if="element.isUser" :user="element.user" :show-user-status="false" />
+							<NcAvatar v-else
+								:is-no-user="true"
+								:display-name="element.displayName"
+								:show-user-status="false" />
 						</template>
 						{{ element.displayName }}
 					</NcButton>

diff --git a/core/src/views/UnifiedSearchModal.vue b/core/src/views/UnifiedSearchModal.vue
@@ -391,6 +391,7 @@ export default {
 					subname: contact.emailAddresses[0] ? contact.emailAddresses[0] : '',
 					icon: '',
 					user: contact.id,
+					isUser: contact.isUser,
 				}
 			})
 		},

diff --git a/dist/core-unified-search.js b/dist/core-unified-search.js
diff --git a/dist/core-unified-search.js.map b/dist/core-unified-search.js.map