Merge pull request #1761 from nextcloud/artonge/fix/minor_fixes

Prevent error when displaying notifications
pull/1765/head
Louis 2023-05-25 17:51:56 +02:00 zatwierdzone przez GitHub
commit 08d6f96188
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 7 dodań i 3 usunięć

Wyświetl plik

@ -45,7 +45,7 @@
{{ t('social', 'boosted') }} {{ t('social', 'boosted') }}
</div> </div>
</template> </template>
<UserEntry v-if="isNotification && notificationIsAboutAnAccount" :item="item.account" /> <UserEntry v-if="isNotification && notificationIsAboutAnAccount" :display-follow-button="false" :item="item.account" />
<template v-else> <template v-else>
<div v-if="entryContent" class="wrapper"> <div v-if="entryContent" class="wrapper">
<TimelineAvatar v-if="!isNotification" class="entry__avatar" :item="entryContent" /> <TimelineAvatar v-if="!isNotification" class="entry__avatar" :item="entryContent" />

Wyświetl plik

@ -212,7 +212,7 @@ export default {
this.$router.push({ this.$router.push({
name: 'single-post', name: 'single-post',
params: { params: {
account: this.item.account.display_name, account: this.item.account.username,
id: this.item.id, id: this.item.id,
type: 'single-post', type: 'single-post',
}, },

Wyświetl plik

@ -53,7 +53,7 @@
<!-- eslint-disable-next-line vue/no-v-html --> <!-- eslint-disable-next-line vue/no-v-html -->
<p v-html="item.note" /> <p v-html="item.note" />
</div> </div>
<FollowButton :uid="item.acct" /> <FollowButton v-if="displayFollowButton" :uid="item.acct" />
</div> </div>
</div> </div>
</template> </template>
@ -78,6 +78,10 @@ export default {
type: Object, type: Object,
default: () => {}, default: () => {},
}, },
displayFollowButton: {
type: Boolean,
default: true,
},
}, },
data() { data() {
return { return {