diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-10-02 15:56:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 15:56:19 +0300 |
| commit | 5480b9de51e33628ea254558243a65be9499eb8c (patch) | |
| tree | bc64a3f14ac365a012e4a7824404874e0029ac5d /src | |
| parent | 8d3d5a44dbaba5f9773b7b70d9c533d89f97e65d (diff) | |
| parent | 329a63e8010b63bf79abee959634c26ab65c3666 (diff) | |
Merge pull request #4253 from nextcloud/bugfix/noid/user_status-show-icon
Show icon only with dnd status in the message
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/AvatarWrapper/AvatarWrapper.vue | 5 | ||||
| -rw-r--r-- | src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue | 3 | ||||
| -rw-r--r-- | src/mixins/userStatus.js | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/components/AvatarWrapper/AvatarWrapper.vue b/src/components/AvatarWrapper/AvatarWrapper.vue index 88c5b1e34..f6dad0537 100644 --- a/src/components/AvatarWrapper/AvatarWrapper.vue +++ b/src/components/AvatarWrapper/AvatarWrapper.vue @@ -33,6 +33,7 @@ :disable-tooltip="disableTooltip" :disable-menu="disableMenu" :show-user-status="showUserStatus" + :show-user-status-compact="showUserStatusCompact" :size="size" /> <div v-else class="guest" @@ -87,6 +88,10 @@ export default { type: Boolean, default: true, }, + showUserStatusCompact: { + type: Boolean, + default: true, + }, }, computed: { // Determines which icon is displayed diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue index 1226829af..3b2207186 100644 --- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue +++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue @@ -33,6 +33,7 @@ :disable-tooltip="true" :size="44" :show-user-status="!isSearched" + :show-user-status-compact="false" :name="computedName" :source="participant.source" :offline="isOffline" /> @@ -209,7 +210,7 @@ export default { }, isOffline() { - return this.participant.status === 'offline' || this.sessionId === '0' + return /* this.participant.status === 'offline' || */ this.sessionId === '0' }, isGuest() { return [PARTICIPANT.TYPE.GUEST, PARTICIPANT.TYPE.GUEST_MODERATOR].indexOf(this.participantType) !== -1 diff --git a/src/mixins/userStatus.js b/src/mixins/userStatus.js index 461ed197d..8782723fa 100644 --- a/src/mixins/userStatus.js +++ b/src/mixins/userStatus.js @@ -44,7 +44,7 @@ const userStatus = { return false } - return userData.status === 'away' || userData.status === 'dnd' + return userData.status === 'dnd' }, }, } |