From e91ad99f567cb742a2cbbce5008b9503536162ea Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 17 Mar 2023 13:25:59 +0100 Subject: [PATCH] fix(webapp): join leave button for pending members --- webapp/components/Button/JoinLeaveButton.vue | 16 ++++++++-------- webapp/pages/group/_id/_slug.vue | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue index 152039eb0..c2836a149 100644 --- a/webapp/components/Button/JoinLeaveButton.vue +++ b/webapp/components/Button/JoinLeaveButton.vue @@ -58,14 +58,6 @@ export default { } return this.$t('group.joinLeaveButton.join') }, - tooltip() { - return { - content: this.$t('group.joinLeaveButton.tooltip'), - placement: 'right', - show: this.isMember && !this.isNonePendingMember && this.hovered, - trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual', - } - }, }, watch: { isMember() { @@ -80,6 +72,14 @@ export default { ...mapMutations({ commitModalData: 'modal/SET_OPEN', }), + tooltip() { + return { + content: this.$t('group.joinLeaveButton.tooltip'), + placement: 'right', + show: this.isMember && !this.isNonePendingMember && this.hovered, + trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual', + } + }, onHover() { if (!this.disabled && !this.localLoading) { this.hovered = true diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue index 1eda842d3..27b6a3cbc 100644 --- a/webapp/pages/group/_id/_slug.vue +++ b/webapp/pages/group/_id/_slug.vue @@ -565,7 +565,7 @@ export default { // }, prepareJoinLeave() { // "membersCountStartValue" is updated to avoid counting from 0 when join/leave - this.membersCountStartValue = this.GroupMembers.length + this.membersCountStartValue = (this.GroupMembers && this.GroupMembers.length) || 0 }, updateJoinLeave({ myRoleInGroup }) { this.Group[0].myRole = myRoleInGroup