ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix primary key usage with different types

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-03-29 13:17:24 +02:00
parent 17c63989b1
commit 541fc9cfbb
10 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/cards/AvatarList.vue
View File

@@ -34,15 +34,15 @@
:size="32" />
<Avatar v-if="user.type === 1"
:user="user.participant.primaryKey"
:display-name="user.participant.primaryKey"
:tooltip-message="user.participant.primaryKey + ' ' + t('deck', '(group)')"
:display-name="user.participant.displayname"
:tooltip-message="user.participant.displayname + ' ' + t('deck', '(group)')"
:is-no-user="true"
:disable-="true"
:size="32" />
<Avatar v-if="user.type === 7"
:user="user.participant.primaryKey"
:display-name="user.participant.primaryKey"
:tooltip-message="user.participant.primaryKey + ' ' + t('deck', '(circle)')"
:display-name="user.participant.displayname"
:tooltip-message="user.participant.displayname + ' ' + t('deck', '(circle)')"
:is-no-user="true"
:disable-="true"
:size="32" />
@@ -91,7 +91,7 @@ export default {
if (assignable.type === 1) {
return 'icon-group'
}
const user = assignable.participant.primaryKey
const user = assignable.participant.uid
const size = 32
const avatarUrl = OC.generateUrl('/avatar/{user}/{size}',
{