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

Fix default display template lookup in m2o interface (#13012)

Browse Source 
Fixes #11825
This commit is contained in:
Rijk van Zanten
2022-04-26 10:35:47 -04:00
committed by GitHub
parent 6828a74d4e
commit 5534736bae
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue
View File

@@ -64,19 +64,18 @@
</template>
<script setup lang="ts">
import { useRelationM2O, useRelationSingle, RelationQuerySingle } from '@/composables/use-relation';
import { RelationQuerySingle, useRelationM2O, useRelationSingle } from '@/composables/use-relation';
import { usePermissionsStore, useCollectionsStore } from '@/stores';
import adjustFieldsForDisplays from '@/utils/adjust-fields-for-displays';
import { useCollection } from '@directus/shared/composables';
import { parseFilter } from '@/utils/parse-filter';
import DrawerCollection from '@/views/private/components/drawer-collection';
import DrawerItem from '@/views/private/components/drawer-item';
import { Filter } from '@directus/shared/types';
import { deepMap, getFieldsFromTemplate } from '@directus/shared/utils';
import { get } from 'lodash';
import { render } from 'micromustache';
import { computed, inject, ref, toRefs } from 'vue';
import { useI18n } from 'vue-i18n';
import DrawerItem from '@/views/private/components/drawer-item';
import DrawerCollection from '@/views/private/components/drawer-collection';
import { parseFilter } from '@/utils/parse-filter';
import { render } from 'micromustache';
import { usePermissionsStore } from '@/stores';
const props = withDefaults(
defineProps<{
@@ -101,6 +100,8 @@ const emit = defineEmits(['input']);
const values = inject('values', ref<Record<string, any>>({}));
const collectionsStore = useCollectionsStore();
const customFilter = computed(() => {
return parseFilter(
deepMap(props.filter, (val: any) => {
@@ -126,13 +127,15 @@ const value = computed({
const selectModalActive = ref(false);
const editModalActive = ref(false);
const { info: collectionInfo } = useCollection(collection);
const displayTemplate = computed(() => {
if (props.template) return props.template;
return (
collectionInfo.value?.meta?.display_template || `{{ ${relationInfo.value?.relatedPrimaryKeyField.field || ''} }}`
);
if (!relationInfo.value) return '';
const displayTemplate = collectionsStore.getCollection(relationInfo.value.relatedCollection.collection)?.meta
?.display_template;
return displayTemplate || `{{ ${relationInfo.value.relatedPrimaryKeyField.field || ''} }}`;
});
const requiredFields = computed(() => {