Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2022-03-22 14:47:55 +0300
committerGitHub <noreply@github.com>2022-03-22 14:47:55 +0300
commit9b6104cb7d7b164c91bdc1ac1d3b5f68f293e3fa (patch)
treeca26865229b1e4a51a7d35b543d42c7987798f35 /src
parent48cd5a2a1d1b2b49a92bc6ce62ad287bf1e5593f (diff)
parente52254b2c21d1363e48a5aaf4bb57abc23449ea6 (diff)
Merge pull request #7033 from nextcloud/bugfix/noid/fix-broken-avatars-in-conversation-creation
Fix broken avatars in conversation creation
Diffstat (limited to 'src')
-rw-r--r--src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js2
-rw-r--r--src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js
index 75e27599d..40ad1018d 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js
@@ -172,7 +172,7 @@ describe('Participant.vue', () => {
test('renders avatar from search result', () => {
participant.label = 'Name from label'
participant.source = 'source-from-search'
- participant.attendeeId = 'id-from-search'
+ participant.id = 'id-from-search'
const wrapper = mountParticipant(participant, true)
const avatarEl = wrapper.findComponent(AvatarWrapper)
expect(avatarEl.exists()).toBe(true)
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
index 6c87c9443..b4ea4433d 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
@@ -409,7 +409,7 @@ export default {
if (!this.isSearched) {
return this.participant.actorId
}
- return this.attendeeId
+ return this.participant.id
},
attendeeId() {