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

resolve conflicts

Browse Source
This commit is contained in:
ogerly 2022-09-09 13:18:46 +02:00
commit 26cf8f14d9
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
webapp/components/Group/GroupForm.vue
View File

@ -127,23 +127,20 @@ export default {
methods: {
submit() {
const { name, about, description, groupType, actionRadius, categoryIds } = this.formData
const variables = {
name,
about,
description,
groupType,
actionRadius,
categoryIds,
}
this.update
? this.$emit('updateGroup', {
name,
about,
description,
actionRadius,
categoryIds,
...variables,
id: this.group.id,
})
: this.$emit('createGroup', {
name,
about,
description,
groupType,
actionRadius,
categoryIds,
})
: this.$emit('createGroup', variables)
},
reset() {
alert('reset')

6
webapp/locales/de.json
View File

@ -372,9 +372,9 @@
},
"group": {
"newGroup": "Erstelle eine neue Gruppe",
"group-created": "Die Gruppe wurde angelegt.",
"group-updated": "Die Gruppendaten wurden geändert.",
"save":"neue Gruppe anlegen",
"group-created": "Die Gruppe wurde angelegt!",
"group-updated": "Die Gruppendaten wurden geändert!",
"save":"Neue Gruppe anlegen",
"update":"Änderung speichern"
},
"hashtags-filter": {

2
webapp/locales/en.json
View File

@ -372,7 +372,7 @@
},
"group": {
"newGroup": "Create a new Group",
"group-created": "The group was created.",
"group-created": "The group was created!",
"group-updated": "The group data has been changed.",
"save":"Create new group",
"update":"Save change"

4
webapp/pages/group/edit/_id.vue
View File

@ -29,11 +29,11 @@ export default {
routes() {
return [
{
name: 'formular',
name: 'General',
path: `/group/edit/${this.group.id}`,
},
{
name: 'members',
name: 'Members',
path: `/group/edit/${this.group.id}/members`,
},
]