From 1acbd468171290010e5fecd8134a0a6dbe283f9b Mon Sep 17 00:00:00 2001 From: Nitwel Date: Tue, 15 Sep 2020 11:20:01 +0200 Subject: [PATCH 1/2] Hide display tab when editing alias --- .../data-model/field-detail/field-detail.vue | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue b/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue index 85957912a0..024df45f9a 100644 --- a/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue +++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue @@ -155,12 +155,17 @@ export default defineComponent({ value: 'interface', disabled: interfaceDisplayDisabled(), }, - { + ]; + + const field: Field | undefined = fieldsStore.getField(props.collection, props.field); + + if ((field?.type || '') != 'alias' && props.type != 'presentation') { + tabs.push({ text: i18n.t('display'), value: 'display', disabled: interfaceDisplayDisabled(), - }, - ]; + }); + } if (['o2m', 'm2o', 'm2m', 'files'].includes(localType.value)) { tabs.splice(1, 0, { @@ -305,9 +310,14 @@ export default defineComponent({ } if (relations.length === 2) { - const relationForCurrent = relations.find((relation: Relation) => (relation.many_collection === collection && relation.many_field === field) || (relation.one_collection === collection && relation.one_field === field)); + const relationForCurrent = relations.find( + (relation: Relation) => + (relation.many_collection === collection && relation.many_field === field) || + (relation.one_collection === collection && relation.one_field === field) + ); - if (relationForCurrent?.many_collection === collection && relationForCurrent?.many_field === field) return 'm2o'; + if (relationForCurrent?.many_collection === collection && relationForCurrent?.many_field === field) + return 'm2o'; if ( relations[0].one_collection === 'directus_files' || From ab929845b6dfe6a8c204c0ab49e757323ca8fc37 Mon Sep 17 00:00:00 2001 From: Nitwel Date: Tue, 15 Sep 2020 16:31:06 +0200 Subject: [PATCH 2/2] fix display tab bug --- .../settings/routes/data-model/field-detail/field-detail.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue b/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue index 024df45f9a..7a854cb132 100644 --- a/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue +++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue @@ -157,9 +157,7 @@ export default defineComponent({ }, ]; - const field: Field | undefined = fieldsStore.getField(props.collection, props.field); - - if ((field?.type || '') != 'alias' && props.type != 'presentation') { + if (state.fieldData.type !== 'alias' && localType.value !== 'presentation') { tabs.push({ text: i18n.t('display'), value: 'display',