From 021fa4487715e1ad25807a87676bf987280b588e Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 18 Sep 2020 12:26:55 -0400
Subject: [PATCH] Fix display rendering in o2m / m2m

Fixes #162
---
 .../interfaces/many-to-many/many-to-many.vue  | 21 ++++++++++++-------
 .../interfaces/one-to-many/one-to-many.vue    |  8 +++----
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/src/interfaces/many-to-many/many-to-many.vue b/app/src/interfaces/many-to-many/many-to-many.vue
index 8a79a1fba0..3582c06763 100644
--- a/app/src/interfaces/many-to-many/many-to-many.vue
+++ b/app/src/interfaces/many-to-many/many-to-many.vue
@@ -16,13 +16,13 @@
 			<template v-for="header in tableHeaders" v-slot:[`item.${header.value}`]="{ item }">
 				<render-display
 					:key="header.value"
-					:value="get(item, header.value)"
+					:value="item[header.value]"
 					:display="header.field.display"
-					:options="header.field.display_options"
+					:options="header.field.displayOptions"
 					:interface="header.field.interface"
-					:interface-options="header.field.options"
+					:interface-options="header.field.interfaceOptions"
 					:type="header.field.type"
-					:collection="header.field.collection"
+					:collection="relatedCollection.collection"
 					:field="header.field.field"
 				/>
 			</template>
@@ -224,15 +224,22 @@ export default defineComponent({
 
 				tableHeaders.value = props.fields.map(
 					(fieldKey): TableHeader => {
-						const fieldInfo = fieldsStore.getField(junctionCollection.value, fieldKey);
+						const field = fieldsStore.getField(junctionCollection.value, fieldKey);
 
 						return {
-							text: fieldInfo.name,
+							text: field.name,
 							value: fieldKey,
 							align: 'left',
 							sortable: true,
 							width: null,
-							field: fieldInfo,
+							field: {
+								display: field.meta?.display,
+								displayOptions: field.meta?.display_options,
+								interface: field.meta?.interface,
+								interfaceOptions: field.meta?.options,
+								type: field.type,
+								field: field.field,
+							},
 						};
 					}
 				);
diff --git a/app/src/interfaces/one-to-many/one-to-many.vue b/app/src/interfaces/one-to-many/one-to-many.vue
index 4f152d3187..de2f136a99 100644
--- a/app/src/interfaces/one-to-many/one-to-many.vue
+++ b/app/src/interfaces/one-to-many/one-to-many.vue
@@ -319,10 +319,10 @@ export default defineComponent({
 								sortable: true,
 								width: null,
 								field: {
-									display: field.display,
-									displayOptions: field.display_options,
-									interface: field.interface,
-									interfaceOptions: field.options,
+									display: field.meta?.display,
+									displayOptions: field.meta?.display_options,
+									interface: field.meta?.interface,
+									interfaceOptions: field.meta?.options,
 									type: field.type,
 									field: field.field,
 								},