mirror of
https://github.com/IT4Change/Ocelot-Social.git
synced 2025-12-13 07:45:56 +00:00
fix(webapp): join leave button for pending members
This commit is contained in:
parent
6480e9ec51
commit
e91ad99f56
@ -58,14 +58,6 @@ export default {
|
|||||||
}
|
}
|
||||||
return this.$t('group.joinLeaveButton.join')
|
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: {
|
watch: {
|
||||||
isMember() {
|
isMember() {
|
||||||
@ -80,6 +72,14 @@ export default {
|
|||||||
...mapMutations({
|
...mapMutations({
|
||||||
commitModalData: 'modal/SET_OPEN',
|
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() {
|
onHover() {
|
||||||
if (!this.disabled && !this.localLoading) {
|
if (!this.disabled && !this.localLoading) {
|
||||||
this.hovered = true
|
this.hovered = true
|
||||||
|
|||||||
@ -565,7 +565,7 @@ export default {
|
|||||||
// },
|
// },
|
||||||
prepareJoinLeave() {
|
prepareJoinLeave() {
|
||||||
// "membersCountStartValue" is updated to avoid counting from 0 when join/leave
|
// "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 }) {
|
updateJoinLeave({ myRoleInGroup }) {
|
||||||
this.Group[0].myRole = myRoleInGroup
|
this.Group[0].myRole = myRoleInGroup
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user