Merge branch '69-title-field-of-additional-fields-crud-list-causes-name-collision' into 'master'

Resolve ""title" field of additional fields CRUD list causes name collision"

Closes #69

See merge request !69

aleksis/apps/paweljong/frontend/components/event_additional_field/EventAdditionalFieldList.vue

@@ -16,7 +16,7 @@ import InlineCRUDList from "aleksis.core/components/generic/InlineCRUDList.vue";
     :get-patch-data="getPatchData"
   >
     <!-- eslint-disable-next-line vue/valid-v-slot -->
-    <template #title.field="{ attrs, on, isCreate }">
+    <template #fieldTitle.field="{ attrs, on, isCreate }">
       <div aria-required="true">
         <v-text-field v-bind="attrs" v-on="on" required :rules="required" />
       </div>
@@ -70,8 +70,8 @@ export default {
     return {
       headers: [
         {
-          text: this.$t("paweljong.event_additional_field.title"),
-          value: "title",
+          text: this.$t("paweljong.event_additional_field.field_title"),
+          value: "fieldTitle",
         },
         {
           text: this.$t(
@@ -104,16 +104,20 @@ export default {
   },
   methods: {
     getCreateData(item) {
+      let {fieldTitle: _, ...filteredObj} = item;
       return {
-        ...item,
+        ...filteredObj,
         required: !!item.required,
+        title: item.fieldTitle,
       };
     },
     getPatchData(item) {
       if ("required" in item) {
+        let {fieldTitle: _, ...filteredObj} = item;
         return {
-          ...item,
+          ...filteredObj,
           required: !!item.required,
+          title: item.fieldTitle,
         };
       }
       return item;

aleksis/apps/paweljong/frontend/components/event_additional_field/eventAdditionalField.graphql

 query eventAdditionalFields($orderBy: [String], $filters: JSONString) {
   items: eventAdditionalFields(orderBy: $orderBy, filters: $filters) {
     id
-    title
+    fieldTitle: title
     fieldType
     required
     helpText
@@ -16,7 +16,7 @@ mutation createEventAdditionalFields(
   createEventAdditionalFields(input: $input) {
     items: eventAdditionalFields {
       id
-      title
+      fieldTitle: title
       fieldType
       required
       helpText
@@ -38,7 +38,7 @@ mutation updateEventAdditionalFields(
   updateEventAdditionalFields(input: $input) {
     items: eventAdditionalFields {
       id
-      title
+      fieldTitle: title
       fieldType
       required
       helpText

aleksis/apps/paweljong/frontend/messages/de.json

@@ -27,6 +27,7 @@
         "event_additional_field": {
             "create": "Zusätzliche Felder für Veranstaltungen erstellen",
             "title": "Zusätzliches Feld für Veranstaltung",
+            "field_title": "Titel",
             "title_plural": "Zusätzliche Felder für Veranstaltungen",
             "menu_title": "Zusätzliche Felder für Veranstaltungen",
             "field_type": {

aleksis/apps/paweljong/frontend/messages/en.json

@@ -27,6 +27,7 @@
     "event_additional_field": {
       "create": "Create additional field for events",
       "title": "Additional Field for Event",
+      "field_title": "Title",
       "title_plural": "Additional Fields For Events",
       "menu_title": "Additional Event Fields",
       "field_type": {