From a32a2d03be5efc3f6f040474dbc307fa8f94d5ce Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Fri, 9 Sep 2022 11:30:48 +0200 Subject: [PATCH 1/7] Update webapp/locales/de.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- webapp/locales/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index a1e25444f..5f3963e09 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -372,8 +372,8 @@ }, "group": { "newGroup": "Erstelle eine neue Gruppe", - "group-created": "Die Gruppe wurde angelegt.", - "group-updated": "Die Gruppendaten wurden geändert.", + "group-created": "Die Gruppe wurde angelegt!", + "group-updated": "Die Gruppendaten wurden geändert!", "save":"neue Gruppe anlegen", "update":"Änderung speichern" }, From b312ce49a5f3cfca60f94f5999949fb6a54862c1 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Fri, 9 Sep 2022 11:31:00 +0200 Subject: [PATCH 2/7] Update webapp/locales/de.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- webapp/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 5f3963e09..c684a3d7b 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -374,7 +374,7 @@ "newGroup": "Erstelle eine neue Gruppe", "group-created": "Die Gruppe wurde angelegt!", "group-updated": "Die Gruppendaten wurden geändert!", - "save":"neue Gruppe anlegen", + "save":"Neue Gruppe anlegen", "update":"Änderung speichern" }, "hashtags-filter": { From ca8047138edd1a749f048eb645c52534d29f4842 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Fri, 9 Sep 2022 11:31:08 +0200 Subject: [PATCH 3/7] Update webapp/locales/en.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- webapp/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/locales/en.json b/webapp/locales/en.json index eb590d5c6..7d9ea7a3d 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -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" From 07b3857e4babc48f7d7c311b0ba26f218f878e45 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Fri, 9 Sep 2022 12:18:57 +0200 Subject: [PATCH 4/7] Update webapp/pages/group/edit/_id/index.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- webapp/pages/group/edit/_id/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/webapp/pages/group/edit/_id/index.vue b/webapp/pages/group/edit/_id/index.vue index 1b2d2037f..87fe95b23 100644 --- a/webapp/pages/group/edit/_id/index.vue +++ b/webapp/pages/group/edit/_id/index.vue @@ -119,7 +119,6 @@ export default { }, } }, - methods: { submit() { const { name, about, description, groupType, actionRadius, categoryIds } = this.formData From ad029247e7f5d8cccab34f242a63eade1f12c851 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Fri, 9 Sep 2022 13:03:38 +0200 Subject: [PATCH 5/7] Update webapp/components/Group/GroupForm.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- webapp/components/Group/GroupForm.vue | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue index 1b2d2037f..cd04f3dd4 100644 --- a/webapp/components/Group/GroupForm.vue +++ b/webapp/components/Group/GroupForm.vue @@ -123,23 +123,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') From 62f57681eb878880fd0b14fa1b61099432c51c0e Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Fri, 9 Sep 2022 13:04:15 +0200 Subject: [PATCH 6/7] Update webapp/pages/group/edit/_id.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- webapp/pages/group/edit/_id.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/pages/group/edit/_id.vue b/webapp/pages/group/edit/_id.vue index ca5f25415..bf27b3c88 100644 --- a/webapp/pages/group/edit/_id.vue +++ b/webapp/pages/group/edit/_id.vue @@ -26,7 +26,7 @@ export default { routes() { return [ { - name: 'formular', + name: 'General', path: `/group/edit/${this.group.id}`, }, { From 7cb965e9adb1b32c79c5c5ec468c11dfa8fff6be Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Fri, 9 Sep 2022 13:04:26 +0200 Subject: [PATCH 7/7] Update webapp/pages/group/edit/_id.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- webapp/pages/group/edit/_id.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/pages/group/edit/_id.vue b/webapp/pages/group/edit/_id.vue index bf27b3c88..fc15118c1 100644 --- a/webapp/pages/group/edit/_id.vue +++ b/webapp/pages/group/edit/_id.vue @@ -30,7 +30,7 @@ export default { path: `/group/edit/${this.group.id}`, }, { - name: 'members', + name: 'Members', path: `/group/edit/${this.group.id}/members`, }, ]