Merge pull request #1021 from nextcloud/enhancement/dav/load-photo-on…

…-list Use dav hasPhoto to properly load photos into the list
nextcloud · Mar 27, 2019 · 2239568 · 2239568
2 parents 2736326 + 5b21689
commit 2239568
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/ContactsList/ContactsListItem.vue b/src/components/ContactsList/ContactsListItem.vue
@@ -11,7 +11,7 @@
 		<div :style="{ 'backgroundColor': colorAvatar }" class="app-content-list-item-icon">
 			{{ contact.displayName | firstLetter }}
 			<!-- try to fetch the avatar only if the contact exists on the server -->
-			<div v-if="contact.photo && contact.dav" :style="{ 'backgroundImage': avatarUrl }" class="app-content-list-item-icon__avatar" />
+			<div v-if="hasPhoto" :style="{ 'backgroundImage': avatarUrl }" class="app-content-list-item-icon__avatar" />
 		</div>
 		<div class="app-content-list-item-line-one">
 			{{ contact.displayName }}
@@ -59,6 +59,10 @@ export default {
 			return window.btoa(this.contact.key).slice(0, -2)
 		},
 
+		hasPhoto() {
+			return this.contact.dav && (this.contact.dav.hasphoto || this.contact.photo)
+		},
+
 		/**
 		 * Is this matching the current search ?
 		 *