ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +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 15:56:40 +01:00
parent 424f5c4172
commit 04b6dc4407
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@
<ds-flex-item width="3.5" style="margin-right: 16px; margin-bottom: 6px"> <ds-flex-item width="3.5" style="margin-right: 16px; margin-bottom: 6px">
<!-- eslint-disable vue/no-v-text-v-html-on-component --> <!-- eslint-disable vue/no-v-text-v-html-on-component -->
<ds-text <ds-text
v-if="groupId" v-if="showGroupHint"
v-html="$t('contribution.visibleOnlyForMembersOfGroup', { name: groupName })" v-html="$t('contribution.visibleOnlyForMembersOfGroup', { name: groupName })"
/> />
<!-- eslint-enable vue/no-v-text-v-html-on-component --> <!-- eslint-enable vue/no-v-text-v-html-on-component -->
@ -171,6 +171,9 @@ export default {
groupId() { groupId() {
return this.group && this.group.id return this.group && this.group.id
}, },
showGroupHint() {
return this.grouupId && ['closed', 'hidden'].includes(this.group.groupType)
},
groupName() { groupName() {
return this.group && this.group.name return this.group && this.group.name
}, },