IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(webapp): join leave button for pending members

Browse Source
This commit is contained in:
Moriz Wahl 2023-03-17 13:25:59 +01:00
parent 6480e9ec51
commit e91ad99f56
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webapp/components/Button/JoinLeaveButton.vue
View File

@ -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

2
webapp/pages/group/_id/_slug.vue
View File

@ -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