github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #231 from directus/m2m-fix

Browse Source 
m2m fix option missing and junction primaryField selectable
This commit is contained in:
Rijk van Zanten
2020-09-09 13:07:02 -04:00
committed by GitHub
parent 573762e489 45f991a3f3
commit d7b3964291
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/interfaces/many-to-many/index.ts
View File

@@ -8,6 +8,19 @@ export default defineInterface(({ i18n }) => ({
component: InterfaceManyToMany,
relationship: 'm2m',
types: ['alias'],
options: [],
options: [
{
field: 'fields',
type: 'json',
name: i18n.tc('field', 0),
meta: {
interface: 'tags',
width: 'full',
options: {
placeholder: i18n.t('readable_fields_copy'),
},
},
},
],
recommendedDisplays: ['related-values'],
}));

4
app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2m.vue
View File

@@ -110,7 +110,9 @@ export default defineComponent({
text: field.field,
value: field.field,
disabled:
state.relations[0].many_field === field.field || state.relations[1].many_field === field.field,
state.relations[0].many_field === field.field ||
field.schema?.is_primary_key ||
state.relations[1].many_field === field.field,
}));
});