ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6068-on-create-edit-group-page-have-additional-hint' of github.com:Ocelot-Social-Community/Ocelot-Social into 6068-on-create-edit-group-page-have-additional-hint

Browse Source 
# Conflicts:
#	webapp/components/ContributionForm/ContributionForm.vue
This commit is contained in:
Wolfgang Huß 2023-03-16 16:06:35 +01:00
commit 9dbb8cae41
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/components/ContributionForm/ContributionForm.vue
View File

@ -172,7 +172,11 @@ export default {
return this.group && this.group.id
},
showGroupHint() {
<<<<<<< HEAD
return this.groupId && ['closed', 'hidden'].includes(this.group.groupType)
=======
return this.grouupId && ['closed', 'hidden'].includes(this.group.groupType)
>>>>>>> 4f6c9319fbc8f764a3dace5320039d5a75ad05ac
},
groupName() {
return this.group && this.group.name