Fix invalid collection for Interface Display Template for M2M relatio…

…nships (directus#9420) * Fix invalid collection for Interface Display Template (directus#9419) * use o2m ollection on m2m interface * apply same fix on files Co-authored-by: Jose Varela <joselcvarela@gmail.com>
adanielyan · Nov 9, 2021 · 604c485 · 604c485
1 parent c8aaace
commit 604c485
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 47 deletions.
diff --git a/app/src/interfaces/files/index.ts b/app/src/interfaces/files/index.ts
@@ -13,59 +13,61 @@ export default defineInterface({
 	types: ['alias'],
 	localTypes: ['files'],
 	group: 'relational',
-	options: ({ relations }: ExtensionsOptionsContext) => [
-		{
-			field: 'folder',
-			name: '$t:interfaces.system-folder.folder',
-			type: 'uuid',
-			meta: {
-				width: 'full',
-				interface: 'system-folder',
-				note: '$t:interfaces.system-folder.field_hint',
-			},
-			schema: {
-				default_value: undefined,
-			},
-		},
-		{
-			field: 'template',
-			name: '$t:display_template',
-			meta: {
-				interface: 'system-display-template',
-				options: {
-					collectionName: relations.m2o?.related_collection ?? null,
+	options: ({ relations }: ExtensionsOptionsContext) => {
+		return [
+			{
+				field: 'folder',
+				name: '$t:interfaces.system-folder.folder',
+				type: 'uuid',
+				meta: {
+					width: 'full',
+					interface: 'system-folder',
+					note: '$t:interfaces.system-folder.field_hint',
+				},
+				schema: {
+					default_value: undefined,
 				},
 			},
-		},
-		{
-			field: 'enableCreate',
-			name: '$t:creating_items',
-			schema: {
-				default_value: true,
-			},
-			meta: {
-				interface: 'boolean',
-				options: {
-					label: '$t:enable_create_button',
+			{
+				field: 'template',
+				name: '$t:display_template',
+				meta: {
+					interface: 'system-display-template',
+					options: {
+						collectionName: relations.o2m?.collection,
+					},
 				},
-				width: 'half',
 			},
-		},
-		{
-			field: 'enableSelect',
-			name: '$t:selecting_items',
-			schema: {
-				default_value: true,
+			{
+				field: 'enableCreate',
+				name: '$t:creating_items',
+				schema: {
+					default_value: true,
+				},
+				meta: {
+					interface: 'boolean',
+					options: {
+						label: '$t:enable_create_button',
+					},
+					width: 'half',
+				},
 			},
-			meta: {
-				interface: 'boolean',
-				options: {
-					label: '$t:enable_select_button',
+			{
+				field: 'enableSelect',
+				name: '$t:selecting_items',
+				schema: {
+					default_value: true,
+				},
+				meta: {
+					interface: 'boolean',
+					options: {
+						label: '$t:enable_select_button',
+					},
+					width: 'half',
 				},
-				width: 'half',
 			},
-		},
-	],
+		];
+	},
 	recommendedDisplays: ['related-values'],
 	preview: PreviewSVG,
 });
diff --git a/app/src/interfaces/list-m2m/index.ts b/app/src/interfaces/list-m2m/index.ts
@@ -21,7 +21,7 @@ export default defineInterface({
 				meta: {
 					interface: 'system-display-template',
 					options: {
-						collectionName: relations.m2o?.related_collection ?? null,
+						collectionName: relations.o2m?.collection,
 					},
 				},
 			},