github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-29 16:28:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid collection for Interface Display Template for M2M relationships (#9420)

Browse Source 
* Fix invalid collection for Interface Display Template (#9419)

* use o2m ollection on m2m interface

* apply same fix on files

Co-authored-by: Jose Varela <joselcvarela@gmail.com>
This commit is contained in:
Rémi Alvergnat
2021-11-04 18:20:55 +01:00
committed by GitHub
parent 7dc80c2f3b
commit 3cd32d533b
2 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
app/src/interfaces/files/index.ts
View File

@@ -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,
},
meta: {
interface: 'boolean',
options: {
label: '$t:enable_select_button',
{
field: 'enableCreate',
name: '$t:creating_items',
schema: {
default_value: true,
},
meta: {
interface: 'boolean',
options: {
label: '$t:enable_create_button',
},
width: 'half',
},
width: 'half',
},
},
],
{
field: 'enableSelect',
name: '$t:selecting_items',
schema: {
default_value: true,
},
meta: {
interface: 'boolean',
options: {
label: '$t:enable_select_button',
},
width: 'half',
},
},
];
},
recommendedDisplays: ['related-values'],
preview: PreviewSVG,
});

2
app/src/interfaces/list-m2m/index.ts
View File

@@ -21,7 +21,7 @@ export default defineInterface({
meta: {
interface: 'system-display-template',
options: {
collectionName: relations.m2o?.related_collection ?? null,
collectionName: relations.o2m?.collection,
},
},
},