From 704cf3ade0f73b272bf75a697f5dedaf5d3e5522 Mon Sep 17 00:00:00 2001
From: Nitwel <nitwel@arcor.de>
Date: Fri, 11 Sep 2020 17:04:48 +0200
Subject: [PATCH] use right collection on O2M

---
 .../v-field-select/v-field-select.vue         |  9 ++++++++-
 app/src/interfaces/one-to-many/options.vue    | 19 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/src/components/v-field-select/v-field-select.vue b/app/src/components/v-field-select/v-field-select.vue
index 67b7240799..bb8cc3e59d 100644
--- a/app/src/components/v-field-select/v-field-select.vue
+++ b/app/src/components/v-field-select/v-field-select.vue
@@ -8,7 +8,14 @@
 		>
 			{{ field.name }}
 		</v-chip>
-		<v-menu showArrow v-model="menuActive" v-show="selectableFields.length > 0" slot="footer" class="add">
+		<v-menu
+			showArrow
+			v-model="menuActive"
+			v-show="selectableFields.length > 0"
+			slot="footer"
+			class="add"
+			placement="bottom-end"
+		>
 			<template #activator="{ toggle }">
 				<v-chip class="field" @click="toggle">
 					<v-icon name="add" />
diff --git a/app/src/interfaces/one-to-many/options.vue b/app/src/interfaces/one-to-many/options.vue
index 54221e6b0e..0fe8d8f20a 100644
--- a/app/src/interfaces/one-to-many/options.vue
+++ b/app/src/interfaces/one-to-many/options.vue
@@ -1,16 +1,17 @@
 <template>
-	<v-notice type="warning" v-if="fieldData.meta.collection == null">
+	<v-notice type="warning" v-if="collection == null">
 		{{ $t('interfaces.one-to-many.no_collection') }}
 	</v-notice>
 	<div v-else>
 		<p class="type-label">{{ $t('select_fields') }}</p>
-		<v-field-select :collection="fieldData.meta.collection" v-model="fields"></v-field-select>
+		<v-field-select :collection="collection" v-model="fields"></v-field-select>
 	</div>
 </template>
 
 <script lang="ts">
 import { Field } from '@/types';
 import { defineComponent, PropType, computed } from '@vue/composition-api';
+import { useRelationsStore } from '@/stores/';
 
 export default defineComponent({
 	props: {
@@ -24,6 +25,8 @@ export default defineComponent({
 		},
 	},
 	setup(props, { emit }) {
+		const relationsStore = useRelationsStore();
+
 		const fields = computed({
 			get() {
 				return props.value?.fields;
@@ -35,7 +38,17 @@ export default defineComponent({
 				});
 			},
 		});
-		return { fields };
+
+		const collection = computed(() => {
+			if (props.fieldData.field == null || props.fieldData.meta?.collection == null) return null;
+			const relationData = relationsStore.getRelationsForField(
+				props.fieldData.meta.collection,
+				props.fieldData.field
+			)?.[0];
+			return relationData.many_collection;
+		});
+
+		return { fields, collection };
 	},
 });
 </script>