github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-13 18:25:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into relational-updates

Browse Source
This commit is contained in:
rijkvanzanten
2020-10-14 12:45:06 -04:00
parent 027537a70e fc5f984da8
commit a06bb4ed63
31 changed files with 21831 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/modules/settings/routes/data-model/field-detail/store.ts
View File

@@ -13,6 +13,7 @@ import { getDisplays } from '@/displays';
import { InterfaceConfig } from '@/interfaces/types';
import { DisplayConfig } from '@/displays/types';
import { Field } from '@/types';
import Vue from 'vue';
const fieldsStore = useFieldsStore();
const relationsStore = useRelationsStore();
@@ -518,9 +519,9 @@ function initLocalStore(
many_collection: '',
many_field: '',
many_primary: '',
one_collection: type === 'files' ? 'directus_files' : '',
one_collection: '',
one_field: null,
one_primary: type === 'files' ? 'id' : '',
one_primary: '',
},
];
}
@@ -592,6 +593,13 @@ function initLocalStore(
}
);
if (type === 'files') {
Vue.nextTick(() => {
state.relations[1].one_collection = 'directus_files';
state.relations[1].one_primary = 'id';
});
}
if (type !== 'translations') {
let stop: WatchStopHandle;