Merge branch '5545-Footer-And-Header-Links-Configurable' of github.com:Ocelot-Social-Community/Ocelot-Social into 5545-Footer-And-Header-Links-Configurable

# Conflicts:
#	webapp/components/Group/GroupMember.vue
This commit is contained in:
Wolfgang Huß 2022-10-28 13:13:53 +02:00
commit 65431c2baf

View File

@ -92,7 +92,6 @@
size="small"
primary
disabled
@click="deleteMember(scope.row.id)"
>
<!-- TODO: implement removal of group members -->
<!-- :disabled="scope.row.myRoleInGroup === 'owner'"
@ -227,9 +226,9 @@ export default {
// this.isOpen = true
// this.memberId = row.id
// },
deleteMember(id) {
alert('deleteMember: ' + id)
},
// deleteMember(id) {
// alert('deleteMember: ' + id)
// },
},
}
</script>